Admin.NET/WCS.Application/OpenApi/OpenApi.cs

@@ -549,7 +549,7 @@
                            HttpService httpService = new HttpService();
                            var inputs = new NullPallInRequest();
                             
                            inputs.PalletNo = modTask.PalletNo;
                            inputs.PalletNo = palletNo;
                            inputs.PallNum = count;
                            inputs.Locate = "B100101";//叠托盘机位置
                            inputs.HouseNo = "W02";

 Admin.NET/WCS.Application/PLC/PLCService.cs

@@ -9,6 +9,7 @@
using Furion.Logging;
using IoTClient;
using NewLife.Reflection;
using Newtonsoft.Json;
using Org.BouncyCastle.Ocsp;
using SixLabors.ImageSharp.ColorSpaces;
using WCS.Application.Entity;
@@ -1430,14 +1431,19 @@
            
            if (taskModel.taskType == "DPJRK")
            {
                //var code = "[{\"type\":\"SITE\",\"code\":\"B100101\"},{\"type\":\"PILE_COUNT\",\"code\":\"8\"}]";
                var code = new List<object>()
                {
                    new {type = "SITE" , code = modTask.StartLocate},
                    new { type = "PILE_COUNT", code = modTask.Qty }
                };
                
                taskModel.targetRoute.Add(new targetRoute() { 
                    seq = 0,
                    type = "MIX_CONDITION",
                    code = new List<object>() { 
                        new { type = "SITE", code = modTask.StartLocate },
                        new { type = "PILE_COUNT", code = modTask.Qty }
                    }
                    
                    code = JsonConvert.SerializeObject(code) // "[{\"type":\"SITE", code = modTask.StartLocate },new { type = "PILE_COUNT", code = modTask.Qty }]"


                });
                taskModel.targetRoute.Add(new targetRoute() { seq = 1, type = type2, code = modTask.EndLocate });
            }

 Admin.NET/WCS.Application/Util/AGVStorageUtil.cs

@@ -99,16 +99,16 @@
            case "STORAGE" when type2 == "SITE":
                {
                    taskModle = "FJ";
                    if (locate1.AreaNo == "B10")
                    {
                        taskModle = "DPJRK";
                    }
                    
                }
                break;
            case "SITE" when type2 == "STORAGE":
                {
                    taskModle = "YCRK"; 

                    taskModle = "YCRK";
                    if (locate1.AreaNo == "B10")
                    {
                        taskModle = "DPJRK";
                    }
                }
                break;
            case "SITE" when type2 == "SITE":

 Admin.NET/WCS.Application/Util/HttpService.cs

@@ -60,7 +60,7 @@
                {
                    TaskType = TaskTypeEnum.In,
                    Status = TaskStatusEnum.Wait,
                    Type = PLCTypeEnum.ConveyorLine,
                    Type = PLCTypeEnum.AGV,
                    Origin = "WMS",

                    Qty = result.TaskList.Qty,
@@ -388,7 +388,7 @@
            {"X-lr-request-id",requestId },
            {"X-lr-version","4.2" },
        };

        Log.Information("调用AGV小车接口下发任务记录" + mod.ToJson());
        var result = await url.SetHeaders(dic).SetBody(mod, "application/json", Encoding.UTF8).PostAsAsync<ResponseAgvDto>();
        Log.Information("调用AGV小车接口下发任务" + result.ToJson());
        return result;