|
|
@@ -131,7 +131,7 @@ namespace WCS.Service.Works.Station
|
|
|
}
|
|
|
var G1 = Device.Find("G1").Create<StationDeviceGroup>();
|
|
|
//只能有一组任务的下一个地址是交货点同时，放货点必须无货
|
|
|
- if (db.Default.Set<WCS_TASK>().Any(v => v.ADDRNEXT == "G1") &&
|
|
|
+ if (db.Default.Set<WCS_TASK>().Any(v => v.ADDRNEXT == "G1") ||
|
|
|
G1.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)
|
|
|
|| v.Data2.Status.HasFlag(IstationStatus.光电状态)
|
|
|
|| v.Data2.Tasknum > 10000
|
