xu.lu 1 年之前
父节点
当前提交
95b90f7b30
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      业务工程/分拣库/WCS.WorkEngineering/WebApi/Controllers/WcsController.cs

+ 3 - 3
业务工程/分拣库/WCS.WorkEngineering/WebApi/Controllers/WcsController.cs

@@ -93,7 +93,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                 switch (task.Type)
                                 {                                   
                                     case TaskType.EnterDepot:
-                                        if (task.Status > Entity.TaskStatus.WaitingToExecute && task.Status > Entity.TaskStatus.AGVExecution)
+                                        if (task.Status > Entity.TaskStatus.WaitingToExecute  && task.BusType != "皮盘入库")
                                         {
                                             response.ResDataList.Add(new HandleTaskResponse()
                                             {
@@ -122,8 +122,8 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                     default:
                                         throw new ArgumentOutOfRangeException();
                                 }
-
-                                var cancelRes = WmsApi.CancelTask(item);
+                                
+                                var cancelRes = WmsApi.CancelTask(item);                                                          
                                 if (cancelRes == null) continue;
 
                                 //找到对应的AGV任务