林豪 左 2 years ago
parent
commit
dc08aaf60c
1 changed files with 12 additions and 3 deletions
  1. 12 3
      Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

+ 12 - 3
Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -568,7 +568,6 @@ namespace WCS.Service.Extensions
         /// <param name="addr">目标地址</param>
         public void Move(StationDeviceGroup addr)
         {
-            
             if (Data.TaskType_1 == RGVTaskType.取货) throw new WarnException($"当前有{Data.TaskType_1}任务,无法执行移动任务");
             if (Data2.WorkMode != RGVMode.自动) throw new WarnException($"RGV状态{Data2.WorkMode},无法执行移动任务");
             if (Data2.SystemStatus != RGVRunStatus.空闲) throw new WarnException($"rgv状态为{Data2.SystemStatus},无法执行移动任务");
@@ -765,9 +764,19 @@ namespace WCS.Service.Extensions
                                 break;
                             }
                         case TaskType.倒库:
-                            task.STATUS = TaskStatus.堆垛机完成;
-                            task.UPDATETIME = DateTime.Now;
+                            if (task.DEVICEDL == Entity.CODE)
+                            {
+                                task.STATUS = TaskStatus.已完成;
+                                task.UPDATETIME = DateTime.Now;
+                            }
+                            else
+                            {
+                                task.STATUS = TaskStatus.堆垛机完成;
+                                task.UPDATETIME = DateTime.Now;
+                            }
+
                             break;
+
                         default:
                             throw new Exception($"[{Entity.CODE}]任务类型错误,{task.ID}");
                     }