|
@@ -64,18 +64,13 @@ namespace WCS.Service.Works.Station
|
|
|
}
|
|
|
|
|
|
var qty = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库 && v.Status > AGVTaskStatus.新建 && v.Status < AGVTaskStatus.完成);
|
|
|
- if (qty.Any(v => v.Station == stationDeviceGroup.Entity.CODE) || agvTasks.Any(v => v.Station == stationDeviceGroup.Entity.CODE))
|
|
|
+ var maxqty = qty.Count(v => v.Station == stationDeviceGroup.Entity.CODE && v.Status >= AGVTaskStatus.请求_允许) + agvTasks.Count(v => v.Station == stationDeviceGroup.Entity.CODE && v.Status >= AGVTaskStatus.请求_允许);
|
|
|
+ if (maxqty >= 2)
|
|
|
{
|
|
|
- InfoLog.INFO_WARN($"已有到达{stationDeviceGroup.Entity.CODE}放货任务,暂停AGV站台分配");
|
|
|
+ InfoLog.INFO_WARN($"{stationDeviceGroup.Entity.CODE}放货任务已达上限,暂停AGV站台分配");
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- //if (qty.Count(v => v.Station == stationDeviceGroup.Entity.CODE) > qty.Count(v => v.Station != stationDeviceGroup.Entity.CODE && !string.IsNullOrEmpty(v.Station)))
|
|
|
- //{
|
|
|
- // InfoLog.INFO_INFO($"{station}触发均分");
|
|
|
- // continue;
|
|
|
- //}
|
|
|
-
|
|
|
tasking.Station = stationDeviceGroup.Entity.CODE;
|
|
|
tasking.Status = AGVTaskStatus.执行;
|
|
|
tasking.UpdateTime = DateTime.Now;
|