Bladeren bron

Merge branch '环穿' of zuolinhao/YG-OPP-WCS into master

zuolinhao 3 jaren geleden
bovenliggende
commit
65269e05ad
1 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 3 1
      Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

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

@@ -129,6 +129,8 @@ namespace WCS.Service.Works.Station
                             }
                             devise.Add(new FinishTaskList<string>(dev.Entity.CODE, dev.Entity.Create<StationDevice>()));
                         }
+                        //验证总数
+                        if (db.Default.Set<WCS_TASK>().Count(v => v.STATUS < TaskStatus.已完成 && v.ADDRNEXT == "G1") >= 3) throw new WarnException("总数已达3,流量管控");
 
                         foreach (var dev in devise)
                         {
@@ -366,7 +368,7 @@ namespace WCS.Service.Works.Station
                     }
 
                     if (!devise.Any()) return;//无可执行任务
-                                              //验证可执行任务数与有效任务数是否一致
+                    //验证可执行任务数与有效任务数是否一致
                     var taskIds = devise.Select(dev => dev.Station.Data2.Tasknum).ToList();
                     var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID)).ToList();
                     var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == taskList.FirstOrDefault().TaskGroupKey && v.TYPE == TaskType.出库);