测试

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

@@ -167,7 +167,7 @@ namespace WCS.Service.Extensions
             {
                 case IstationRequest.无:
                     if (Data2.Tasknum < 10000 && Data.Tasknum < 10000)
-                        throw new Exception(LogHelper.SpliceLogMessage($"设备已有任务任务", Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常, GetType()));
+                        throw new Exception(LogHelper.SpliceLogMessage($"设备无任务", Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常, GetType()));
                     break;
 
                 case IstationRequest.扫码入库:

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

@@ -22,8 +22,9 @@ namespace WCS.Service.Extensions
         /// <returns></returns>
         public static List<WCS_TASK> GetOutTask(this List<WCS_TASK> tasks)
         {
-            var taskids = tasks.Select(v => Create<Task>(v)).OrderBy(v => v.Line).ThenBy(v => v.Col).ThenBy(v => v.Layer).Take(2).DistinctBy(v => v.SRMSTATION).Select(v => v.ID);
-            return tasks.Where(v => taskids.Contains(v.ID)).ToList();
+            var taskids = tasks.Select(v => Create<Task>(v)).OrderBy(v => v.Line).ThenBy(v => v.Col).ThenBy(v => v.Layer).Take(2).Select(v => v.ID);
+            var taskList = tasks.Where(v => taskids.Contains(v.ID)).ToList();
+            return taskList;
         }
     }