Admin.NET/WCS.Application/Model/AGVModel.cs

@@ -77,7 +77,7 @@
        /// DELIVERY送货
        /// ROTATE旋转
        /// </summary>
        public string code { get; set; } 
        public object code { get; set; } 
    }
    public class extra
    {

 Admin.NET/WCS.Application/Model/TaskRequest.cs

@@ -128,6 +128,11 @@
    /// </summary>
    public string LotNo { get; set; }

    /// <summary>
    /// 数量
    /// </summary>
    public int? Qty { get; set; }

}

/// <summary>

 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,8 @@
using Furion.Logging;
using IoTClient;
using NewLife.Reflection;
using Newtonsoft.Json;
using Org.BouncyCastle.Ocsp;
using SixLabors.ImageSharp.ColorSpaces;
using WCS.Application.Entity;
using WCS.Application.Util;
@@ -1424,11 +1426,33 @@
        taskModel.taskType = taskTypeModel;
        if (jiebo == "")
        {
            taskModel.targetRoute = new List<targetRoute>()
            
            taskModel.targetRoute = new List<targetRoute>();
            
            if (taskModel.taskType == "DPJRK")
            {
                new targetRoute(){seq = 0,type = type1,code = modTask.StartLocate},
                new targetRoute(){seq = 1,type = type2,code = modTask.EndLocate}
            };
                //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 = 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 });
            }
            else
            {
                taskModel.targetRoute.Add(new targetRoute() { seq = 0, type = type1, code = modTask.StartLocate });
                taskModel.targetRoute.Add(new targetRoute() { seq = 1, type = type2, code = modTask.EndLocate });
            }
            
        }
        else
        {
@@ -1439,14 +1463,19 @@
                new targetRoute(){seq = 2,type = type2,code = modTask.EndLocate}
            };
        }
        
        taskModel.extra = new extra()

        taskModel.extra = new extra();
         
        if (taskModel.taskType != "DPJRK")
        {
            carrierInfo = new List<carrierInfo>()
            taskModel.extra.carrierInfo = new List<carrierInfo>()
            {
                new carrierInfo(){ carrierType = "TP",carrierCode = modTask.PalletNo}
            }
        };
            };
        }
            
         

        var response = new HttpService().GenAgvSendTask(taskModel).Result;
        if (response.code == "SUCCESS")
        {

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

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

                    else if (locate2.AreaNo == "B10")
                    { 
                        taskModle = "PF-FMR-STACK-NOTIFY-TASK"; 
                    }
                }
                break;
            default:

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

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

                    Qty = result.TaskList.Qty,
                    PalletNo = model.PalletNo,
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,
@@ -387,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;