|
|
@@ -59,12 +59,12 @@ namespace WCS.Service.Works.Station
|
|
|
}
|
|
|
else if (agvtask.Status == AGVTaskStatus.确认 && agvtask.Status > agvtask.AGVStatus)
|
|
|
{
|
|
|
- if (agvtask.Station != obj.Entity.CODE) continue;
|
|
|
- if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位))) continue;
|
|
|
- if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动))) continue;
|
|
|
- if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) continue;
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) continue;
|
|
|
- if (obj.Items.Any(v => v.Data2.Tasknum > 10000)) continue;
|
|
|
+ //if (agvtask.Station != obj.Entity.CODE) continue;
|
|
|
+ //if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位))) continue;
|
|
|
+ //if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动))) continue;
|
|
|
+ //if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) continue;
|
|
|
+ //if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) continue;
|
|
|
+ //if (obj.Items.Any(v => v.Data2.Tasknum > 10000)) continue;
|
|
|
|
|
|
//暂时管控同一时间被执行的任务数为1
|
|
|
if (db.Default.Set<WCS_AGVTask>().Count(v => v.Status == AGVTaskStatus.执行 && v.Station == obj.Entity.CODE && v.ID != agvtask.ID) >= 2) continue;
|
Administrator