xu.lu 1 год назад
Родитель
Сommit
78847ed2db

+ 1 - 1
业务工程/分拣库/WCS.WorkEngineering/Systems/分拣支线/环形库分流点.cs

@@ -112,7 +112,7 @@ namespace WCS.WorkEngineering.Systems
                     World.Log($"超时执行记录:任务号[{taskInfo.ID}]-[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]");
                     return;
                 }
-                else if (taskInfo.Grade != null &&(taskInfo.Grade.ToUpper() == "B" || taskInfo.Grade.ToUpper() == "C")  && obj.Data2.TaskNumber == taskInfo.ID)
+                else if (taskInfo.Grade != null &&(taskInfo.Grade.ToUpper() != "A")  && obj.Data2.TaskNumber == taskInfo.ID)
                 {
                     obj.Data.TaskNumber = 3;
                     obj.Data.GoodsEnd = obj.Entity.Code.ToShort();

+ 11 - 0
业务工程/分拣库/WCS.WorkEngineering/WebApi/Controllers/AgvApi.cs

@@ -174,6 +174,17 @@ namespace WCS.WorkEngineering.WebApi.Controllers
             });
             if (res.code != AgvResponseCode.Success)
             {
+                if (res.message.Contains("未知的呼叫站点"))
+                {
+                    if (taskType == "ZTGT35")
+                    {
+                        res.message = positionCodePath[1].positionCode + res.message;
+                    }
+                    else if (taskType == "ZTGT31")
+                    {
+                        res.message = positionCodePath[0].positionCode + res.message;
+                    }                
+                }
                 throw new KnownException($"AGV返回错误:{res.message}", LogLevelEnum.High);
             }
             return res;