|
@@ -115,13 +115,13 @@ namespace WCS.Service.Extensions
|
|
|
if (!taksList.Any() || index > (taksList.Length - 1)) throw new DoException("无可执行出库任务");
|
|
|
var outDepot = taksList[index];
|
|
|
var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.TYPE == TaskType.出库 && v.STATUS == TaskStatus.新建 && v.ADDRTO == outDepot.Key && v.Priority > 0 && v.DEVICE != srm.Entity.CODE);
|
|
|
- if (task == null) return outDepot.ToList();
|
|
|
+ if (task == null) return outDepot.ToList(); // 没有优先
|
|
|
var dev = Device.Find(task.DEVICE).Create<SRMDevice>();
|
|
|
- if (task != null && dev.Data2.SRMMode == SCMode.远程 && dev.Data2.SRMStatus == SCRunStatus.空闲)
|
|
|
+ if (dev.Data2.SRMMode == SCMode.远程 && dev.Data2.SRMStatus == SCRunStatus.空闲)
|
|
|
{
|
|
|
taksList.GetSrmValidTaskList(db, srm, index++);
|
|
|
}
|
|
|
- return outDepot.ToList();
|
|
|
+ return outDepot.ToList(); //优先任务对应的堆垛机没有空闲
|
|
|
}
|
|
|
}
|
|
|
|