Administrator před 3 roky
rodič
revize
5fb086e6ea

+ 1 - 1
Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -191,7 +191,7 @@ namespace WCS.Service.Works.SRM
                         var validDev = devs.Where(v => v.Data2.Tasknum > 10000 && v.Data2.Status.HasFlag(IstationStatus.光电状态) && !v.Data3.Status.HasFlag(StationStatus.运行状态位));
                         if (!validDev.Any()) throw new DoException("无有效入库任务");
                         var tasknum = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == validDev.First().Data2.Tasknum);
-                        var taskList = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == tasknum.TaskGroupKey);
+                        var taskList = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == tasknum.TaskGroupKey&&v.TYPE== TaskType.入库);
                         if (validDev.Count() != taskList) throw new WarnException($"任务数量不匹配,设备-{validDev.Count()},WCS-{taskList}");
 
                         foreach (var dev in validDev)

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

@@ -57,7 +57,7 @@ namespace WCS.Service.Works.Station
                             //同时最多只能有10个任务被确认
                             if (qty.Count() >= 10)
                             {
-                                InfoLog.INFO_WarnDb($"{obj.Entity.CODE}正在执行的入库任务数量已达{qty},暂停入库", obj.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常);
+                                InfoLog.INFO_WarnDb($"{obj.Entity.CODE}正在执行的入库任务数量已达{qty.Count()},暂停入库", obj.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常);
                                 continue;
                             };