|
@@ -246,11 +246,11 @@ namespace WCS.Service.Works.Stations
|
|
|
|
|
|
db.Default.SaveChanges();
|
|
|
}
|
|
|
- else if (Ltc.Do(agvtask, v => v.Status < v.AGVStatus || v.AGVStatus== AGVTaskStatus.确认))
|
|
|
+ else if (Ltc.Do(agvtask, v => v.Status < v.AGVStatus || v.AGVStatus == AGVTaskStatus.确认))
|
|
|
{
|
|
|
if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.确认))
|
|
|
{
|
|
|
- if (agvTasks.Any(v => v.Status >= AGVTaskStatus.确认 && v.Status != AGVTaskStatus.执行 && v.Station == "3001"))
|
|
|
+ if (agvTasks.Any(v => v.Status >= AGVTaskStatus.确认 && v.Status != AGVTaskStatus.执行 && v.Status < AGVTaskStatus.完成扫码 && v.Station == "3001"))
|
|
|
throw new Exception($"同时放货任务数量最大为1");
|
|
|
// 缓存位与取放货位没有光电 任务 去往缓存位任务 ,如果楼上没有出库任务,就不会有去往3006的任务
|
|
|
var inTemp = Device.Find("3006", "3001").Select(v => v.Device<IStation521>());
|