|
@@ -179,7 +179,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
if (!isTransfer) //存在调整优先级任务
|
|
|
{
|
|
|
//获取出库任务中新建状态最大优先级
|
|
|
- var outPriorityNewBuild = tasks.Where(v => v.Type == TaskType.OutDepot && v.Status == Entity.TaskStatus.NewBuild).Max(v => v.Priority);
|
|
|
+ var outPriorityNewBuild = tasks.Where(v => v.Type == TaskType.OutDepot && v.Status == Entity.TaskStatus.WaitingToExecute).Max(v => v.Priority);
|
|
|
//获取入库任务中最大优先级
|
|
|
var enterPriority = tasks.Where(v => v.Type == TaskType.EnterDepot && v.Status < Entity.TaskStatus.StackerExecution).Max(v => v.Priority);
|
|
|
//出入库最大优先级相加大于零
|
|
@@ -364,7 +364,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
task = db.Default.Queryable<WCS_TaskInfo>()
|
|
|
.Where(v => v.Type == TaskType.OutDepot && v.Status == TaskStatus.WaitingToExecute)
|
|
|
.Where(v => allOutCode.Contains(v.SrmStation) && v.AddrFrom == res.ResData.CellNo)
|
|
|
- .First();
|
|
|
+ .First() ?? throw new KnownException($"请尽快搬离{obj.Entity.Code}二楼出库口满轮,当前堆垛机出库任务呗阻塞", LogLevelEnum.Mid);
|
|
|
break;
|
|
|
};
|
|
|
if (res.ResData.ResType == WmsApiMoveTask.执行移库任务) return;
|
|
@@ -400,8 +400,8 @@ namespace WCS.WorkEngineering.Systems
|
|
|
|
|
|
public override bool Select(Device dev)
|
|
|
{
|
|
|
- //return dev.Code == "SRM2";
|
|
|
- return dev.HasProtocol(typeof(ISRM520));
|
|
|
+ return dev.Code == "SRM2";
|
|
|
+ //return dev.HasProtocol(typeof(ISRM520));
|
|
|
}
|
|
|
}
|
|
|
}
|