浏览代码

更新BOPP 筛选条件

林豪 左 3 年之前
父节点
当前提交
e724a85987

+ 5 - 10
Projects/永冠OPP/WCS.Service/Works/Station/BOPP入库.cs

@@ -42,7 +42,7 @@ namespace WCS.Service.Works.Station
                     {
                         var dev = item.Station;
                         var next = dev.Entity.GetPath("SRM");
-                        var info = infos.FirstOrDefault(v => item.FinishCode.Contains(v.ContainerCode));
+                        var info = infos.FirstOrDefault(v => item.FinishCode.Contains(v.ContainerCode + "}"));
                         if (db.Default.Set<WCS_TASK>().AsNoTracking().Any(v => v.BARCODE == info.ContainerCode && v.STATUS < TaskStatus.已完成 && v.TYPE == TaskType.入库))
                             throw new WarnException($"生产条码{info.ContainerCode}存在未完成任务,请检查是否为标签卡重复使用");
 
@@ -92,7 +92,7 @@ namespace WCS.Service.Works.Station
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return false;
+            return dev.CODE == "G1157";
         }
     }
 
@@ -203,7 +203,7 @@ namespace WCS.Service.Works.Station
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return false;
+            return dev.CODE == "G23";
         }
     }
 
@@ -307,14 +307,9 @@ namespace WCS.Service.Works.Station
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return false;
+            return devCodes.Contains(dev.CODE);
         }
 
-        private List<string> devCodes = new List<string>() {
-            "G1404",
-            "G1413",
-            "G1420",
-            "G1429",
-        };
+        private List<string> devCodes = new List<string>() { "G1190", "G1199", "G1208", "G1217", "G1225" };
     }
 }

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

@@ -223,7 +223,7 @@ namespace WCS.Service.Works.Station
                     {
                         var dev = item.Station;
                         var next = dev.Entity.GetPath("SRM");
-                        var info = infos.FirstOrDefault(v => item.FinishCode.Contains(v.ContainerCode));
+                        var info = infos.FirstOrDefault(v => item.FinishCode.Contains(v.ContainerCode + "}"));
                         if (db.Default.Set<WCS_TASK>().AsNoTracking().Any(v => v.BARCODE == info.ContainerCode && v.STATUS < TaskStatus.已完成 && v.TYPE == TaskType.入库))
                             throw new WarnException($"生产条码{info.ContainerCode}存在未完成任务,请检查是否为标签卡重复使用");