From 5be45b63b4825d2bc330cc84f186a229e2683e77 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期二, 19 八月 2025 16:53:34 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1e2777a..e770367 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -68,10 +68,10 @@
         add(1); add(2);add(3);add(4);add(5);
     }};
 
-    public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
+   /* public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
         add(6);add(7);add(8);add(9);
         add(10); add(11); add(12); add(13);
-    }};
+    }};*/
     /*public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
         add(102); add(105);add(107);add(109);
         add(203);add(205);add(208);add(211);
@@ -83,13 +83,13 @@
     }};
 
     public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
-        add(223);add(225);add(228);add(231);
+        add(101);add(102);add(103);add(104);add(105);
     }};
 
-    public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
+    /*public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
         add(102);add(105);add(107);add(109);
         add(203);add(205);add(208);add(211);
-    }};
+    }};*/
 
     private Integer count=0;
 
@@ -130,8 +130,8 @@
         switch (slave.getId()) {
             case 1:
                 return staNoWeight1;
-            case 2:
-                return staNoWeight2;
+            /*case 2:
+                return staNoWeight2;*/
             default:
                 throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
@@ -151,8 +151,8 @@
         switch (slave.getId()) {
             case 1:
                 return BarcodeList1;
-            case 2:
-                return BarcodeList2;
+            /*case 2:
+                return BarcodeList2;*/
             default:
                 throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
         }

--
Gitblit v1.9.1