林豪 左 2 gadi atpakaļ
vecāks
revīzija
025c4efa29
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

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

@@ -425,7 +425,7 @@ namespace WCS.Service.Works.SRM
                                                .ToArray();
                     var finishTaskList = new List<FinishTaskList<int>>(); //成功分配货位的任务
                     //检测有效任务数与实际任务是是否相等
-                    var validDev = devise.Where(v => v.Data2.Tasknum > 10000 && v.Data2.Status.HasFlag(IstationStatus.光电状态) && !v.Data3.Status.HasFlag(StationStatus.运行状态位));
+                    var validDev = devise.Where(v => v.Data2.Tasknum > 10000 && v.Data2.Status.HasFlag(IstationStatus.光电状态) && !v.Data3.Status.HasFlag(StationStatus.运行状态位)).OrderBy(v => v.Entity.Is(DF.SRM涂布取货) ? 0 : 1).ToArray();
                     var stationDevices = validDev as StationDevice[] ?? validDev.ToArray();
                     if (!stationDevices.Any()) throw new DoException("无有效入库任务");
                     DB.Do(db =>
@@ -689,4 +689,4 @@ namespace WCS.Service.Works.SRM
             return dev.Is(DF.SRM);
         }
     }
-}
+}