Browse Source

优化出库优先级

林豪 左 3 năm trước cách đây
mục cha
commit
347a2b6f1a

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

@@ -24,11 +24,14 @@ namespace WCS.Service.Extensions
         public static Task[] GetOutTask(this List<WCS_TASK> tasks)
         {
             return tasks.Select(v => v.Create<Task>())
-                               .OrderBy(v => v.Line)
-                               .ThenBy(v => v.Layer)
-                               .ThenBy(v => v.Col)
-                               .Take(2)
-                               .DistinctBy(v => v.Col).OrderBy(v => v.Col).ToArray();
+                        .OrderBy(v => v.Priority)
+                        .ThenBy(v => v.Line)
+                        .ThenBy(v => v.Layer)
+                        .ThenBy(v => v.Col)
+                        .Take(2)
+                        .DistinctBy(v => v.Col)
+                        .OrderBy(v => v.Col)
+                        .ToArray();
         }
 
         /// <summary>
@@ -89,6 +92,7 @@ namespace WCS.Service.Extensions
             ADDRTO = task.ADDRTO;
             TUNNEL = task.TUNNEL;
             DEVICE = task.DEVICE;
+            Priority = task.Priority;
 
             ID = task.ID;
             Line = addrFrom[0].ToShort();