提交

Administrator

9 天以前 42727048a245026b3e3022859da9cec8977bff2a

提交

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

@@ -1433,10 +1433,8 @@
                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 = "[{\"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"; 

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

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

@@ -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;