|
@@ -377,10 +377,10 @@ namespace WCS.WorkEngineering.Systems
|
|
|
var allOutCode = arrOut.Select(v => v.Entity.Code).ToList();
|
|
|
|
|
|
//按条件先后排序获取一条排序后第一条结果1.优先级2.所在楼层与本次优先执行楼层
|
|
|
- var task = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(v => v.Status == TaskStatus.WaitingToExecute && allOutCode.Contains(v.SrmStation) && v.Type == TaskType.OutDepot)
|
|
|
+ var task = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(v => v.Status == TaskStatus.WaitingToExecute && allOutCode.Contains(v.SrmStation) && v.Type == TaskType.OutDepot).ToList()
|
|
|
.OrderByDescending(v => v.Priority)
|
|
|
- .OrderByDescending(v => v.Floor == floor ? 1 : 0)
|
|
|
- .OrderBy(v => v.AddTime)
|
|
|
+ .ThenByDescending(v => v.Floor == floor ? 1 : 0)
|
|
|
+ .ThenBy(v => v.AddTime)
|
|
|
.First() ?? throw new KnownException($"{obj.Entity.Code}未找到出库任务", LogLevelEnum.High);
|
|
|
task.Status = TaskStatus.StackerExecution;
|
|
|
task.LastInteractionPoint = task.Device;
|