Browse Source

只能有一个允许放货的任务

林豪 左 3 years ago
parent
commit
9ec7354919
1 changed files with 2 additions and 6 deletions
  1. 2 6
      Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

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

@@ -116,12 +116,8 @@ namespace WCS.Service.Works.Station
                                     InfoLog.INFO_WarnDb("已有WCS任务号", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
                                     continue;
                                 }
-                                if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == agvtask.Station && v.Status == agvtask.AGVStatus && v.ID != agvtask.ID))//只能有一个AGV请求
-                                {
-                                    InfoLog.INFO_WarnDb("只能允许一个AGV任务放货", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
-                                    continue;
-                                }
-                                if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == agvtask.Station && v.Status == AGVTaskStatus.请求_允许 && v.ID != agvtask.ID)) //只能允许一个
+
+                                if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == agvtask.Station && v.Status >= AGVTaskStatus.请求_允许 && v.Status <= AGVTaskStatus.完成扫码 && v.ID != agvtask.ID)) //只能允许一个
                                 {
                                     InfoLog.INFO_WarnDb("上一个允许放货的AGV任务未完成", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
                                     continue;