|
|
@@ -605,7 +605,8 @@ namespace WCS.Service.Works.SRM
|
|
|
.Where(d => d.TYPE == TaskType.出库)
|
|
|
.Where(d => d.STATUS > TaskStatus.新建)
|
|
|
.Where(d => d.STATUS < TaskStatus.已完成).ToList();
|
|
|
- var outDepotGrouping = waitTask.Where(v => cTaskList.Where(d => d.ADDRTO == v.ADDRTO && d.FLOOR == v.FLOOR).GroupBy(d => d.TaskGroupKey).Count() < maximum)
|
|
|
+
|
|
|
+ var outDepotGrouping = waitTask.Where(v => cTaskList.Where(d => d.ADDRTO == v.ADDRTO && d.FLOOR == v.FLOOR).GroupBy(d => d.TaskGroupKey).Count() < maximum || v.ADDRTO == "G1340")
|
|
|
.OrderByDescending(v => v.Priority)
|
|
|
.ThenBy(v => v.ADDRTO == "G1340" ? 0 : 1)
|
|
|
.ThenBy(v => v.FLOOR == floor ? 0 : 1)
|
