update

Projects/永冠OPP/WCS.Service/Extensions/TaskExtension.cs

@@ -1,5 +1,4 @@
-using DBHelper;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using WCS.Core;
@@ -35,26 +34,6 @@ namespace WCS.Service.Extensions
                         .ToArray();
         }
 
-        /// <summary>
-        /// 入库任务是否有效
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="dev1IsThereATask"></param>
-        /// <param name="dev2IsThereATask"></param>
-        /// <param name="db"></param>
-        /// <returns></returns>
-        /// <exception cref="WarnException"></exception>
-        public static bool TaskValid(this WCS_TASK source, bool dev1IsThereATask, bool dev2IsThereATask, DB db)
-        {
-            var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == source.TaskGroupKey);
-            return taskCount switch
-            {
-                1 => dev1IsThereATask || dev2IsThereATask,
-                2 => dev1IsThereATask && dev2IsThereATask,
-                _ => throw new WarnException($"同组任务最多为2,当前任务组有{taskCount}"),
-            };
-        }
-
         /// <summary>
         /// 获取出库任务的站台号及下一个地址
         /// </summary>

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -165,6 +165,7 @@ namespace WCS.Service.Works.SRM
                         var dev1IsThereATask = dev1.Data2.Tasknum > 0 && dev1.Data2.Status.HasFlag(IstationStatus.光电状态) && !dev1.Data3.Status.HasFlag(StationStatus.运行状态位);
                         var dev2IsThereATask = dev2.Data2.Tasknum > 0 && dev2.Data2.Status.HasFlag(IstationStatus.光电状态) && !dev2.Data3.Status.HasFlag(StationStatus.运行状态位);
 
+                        //检测任务数量与可用任务数量是否有效
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.STATUS < TaskStatus.堆垛机执行 && v.ID == st.Data2.Tasknum);
                         var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey);
                         return taskCount switch