From f7584f6dfb88f4d66f381eb1404b7eaab5ac014a Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 06 十二月 2022 14:42:49 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9cb7875..a7d735b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,19 +42,16 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(100);add(101);add(102);add(103);
-        add(104);add(105);add(106);add(110);
-        add(111);add(112);add(113);add(114);
-        add(115);add(116);
-        add(200);add(201);add(202);add(203);
-        add(204);add(205);add(300);add(301);
-        add(302);add(303);add(304);add(305);
+        add(100);add(101);add(102);add(103);add(104);add(105);add(106);
+        add(110);add(111);add(112);add(113);add(114);add(115);add(116);
+        add(200);add(201);add(202);add(203);add(204);add(205);
+        add(300);add(301);add(302);add(303);add(304);add(305);
     }};
 
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 1;
+    private int barcodeSize = 8;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -65,9 +62,7 @@
      * 4.鍑哄簱妯″紡
      */
     public IoModeType ioModeOf2F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
     public IoModeType ioModeOf4F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -129,8 +124,8 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
-//        // 鏇存柊鍏ュ嚭搴撴ā寮�
-//        updateIoMode();
+        // 鏇存柊鍏ュ嚭搴撴ā寮�
+        updateIoMode();
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*2));
         OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));

--
Gitblit v1.9.1