|
@@ -409,7 +409,7 @@ namespace WCS.Service.Works.Station
|
|
|
if (rgvDeliveryPoint == null) continue;
|
|
|
var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).MinBy(p => p.CODE);
|
|
|
//只能有一组任务的下一个地址是交货点
|
|
|
- if (db.Default.Set<WCS_TASK>().Any(v => v.ADDRNEXT == taskInStation.CODE)) continue;
|
|
|
+ if (db.Default.Set<WCS_TASK>().Any(v => v.ADDRNEXT == taskInStation.CODE && v.STATUS < TaskStatus.已完成)) continue;
|
|
|
|
|
|
//RGV是否有正在前往这个地址的任务
|
|
|
var rgvList = Device.Where(v => v.Is(DF.涂布RGV)).Select(v => v.Create<RGVDevice>());
|