Administrator hace 2 años
padre
commit
1c314f42a6

+ 1 - 1
Projects/永冠OPP/WCS.Service/Extensions/TaskExtension.cs

@@ -105,7 +105,7 @@ namespace WCS.Service.Extensions
         public static void ValidTaskCheck(this List<WCS_TASK> tasks, int executable, DB db)
         {
             var task = tasks.FirstOrDefault();
-            var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey && v.TYPE == TaskType.入库);
+            var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey && (v.TYPE == TaskType.入库 || v.TYPE == TaskType.倒库));
             //开始检查任务数是否匹配
             if (executable != taskCount) throw new WarnException($"可执行数{executable},任务组任务数{taskCount},数量不匹配,{task.ID}-{task.TaskGroupKey}");
         }

+ 8 - 3
Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -547,7 +547,11 @@ namespace WCS.Service.Works.Station
                     {
                         var dev = item.Entity.Create<StationDevice>();
                         var task = taskList.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
-                        if (task.TYPE == TaskType.倒库) continue;
+                        if (task.TYPE == TaskType.倒库)
+                        {
+                            finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
+                            continue;
+                        }
                         if (task == null) throw new WarnException($"WCS无该任务{dev.Data2.Tasknum}--{dev.Entity.CODE}");
 
                         task.DEVICE = tunnelInfo.SRM.Entity.CODE;
@@ -595,11 +599,12 @@ namespace WCS.Service.Works.Station
             return _devCodes.Contains(dev.CODE);
         }
 
-        private readonly List<string> _devCodes = new() {
+        private readonly List<string> _devCodes = new()
+        {
             "G1404",
             "G1413",
             "G1420",
             "G1429",
         };
     }
-}
+}