林豪 左 3 жил өмнө
parent
commit
2b5c9a344d

+ 4 - 1
Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -65,7 +65,10 @@ 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.Count(v => v.Station == stationDeviceGroup.Entity.CODE) >= 1) throw new Exception($"已有到达{stationDeviceGroup.Entity.CODE}放货任务,暂停AGV站台分配");
+                            if (qty.Any(v => v.Station == stationDeviceGroup.Entity.CODE) || agvTasks.Any(v => v.Station == stationDeviceGroup.Entity.CODE))
+                            {
+                                throw new Exception($"已有到达{stationDeviceGroup.Entity.CODE}放货任务,暂停AGV站台分配");
+                            }
 
                             //if (qty.Count(v => v.Station == stationDeviceGroup.Entity.CODE) > qty.Count(v => v.Station != stationDeviceGroup.Entity.CODE && !string.IsNullOrEmpty(v.Station)))
                             //{