|
@@ -108,7 +108,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
{
|
|
|
if (task.Device.Contains("Robot"))
|
|
|
{
|
|
|
- var lastTask = db.Default.Queryable<WCS_TaskInfo>().NoLock().First(x => x.Type == TaskType.OutDepot && x.AddrTo == task.AddrTo && x.Status > TaskStatus.WaitingToExecute);
|
|
|
+ var lastTask = db.Default.Queryable<WCS_TaskInfo>().NoLock().First(x => x.Type == TaskType.OutDepot && x.AddrTo == task.AddrTo && x.Status > TaskStatus.WaitingToExecute && x.Status< TaskStatus.Finish);
|
|
|
if (lastTask != null)
|
|
|
{
|
|
|
World.Log($"等待任务结束:{task.AddrTo}上一组码垛任务未结束,等待{lastTask.ID}任务完成后开始初始化当前任务{task.ID}");
|