From bc2bfeb28739207ddb9144464271b28b2003e157 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 08 十二月 2022 09:49:32 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c89b0ce..c5e008a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,6 +43,9 @@
     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);
+    }};
+
+    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
         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);
@@ -51,7 +54,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 1;
+    private int barcodeSize = 8;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -61,10 +64,16 @@
      * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
      * 4.鍑哄簱妯″紡
      */
-    public IoModeType ioModeOf2F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
-    public IoModeType ioModeOf4F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
+    public IoModeType ioModeOf1F1 = IoModeType.NONE;
+    public IoModeType ioModeOf1F2 = IoModeType.NONE;
+    public IoModeType ioModeOf1F3 = IoModeType.NONE;
+    public IoModeType ioModeOf1F4 = IoModeType.NONE;
+    public IoModeType ioModeOf2F1 = IoModeType.NONE;
+    public IoModeType ioModeOf2F2 = IoModeType.NONE;
+    public IoModeType ioModeOf3F1 = IoModeType.NONE;
+    public IoModeType ioModeOf3F2 = IoModeType.NONE;
+
+
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -126,8 +135,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));
@@ -270,10 +279,52 @@
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
-        if (this.ioModeOf2F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+        if (this.ioModeOf1F1 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.300", this.ioModeOf1F1.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎1F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf1F2 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F2.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎1F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf1F3 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F3.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf1F4 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F4.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf2F1 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F1.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf2F2 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F2.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf3F1 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf3F1.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (this.ioModeOf3F2 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf3F2.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
     }

--
Gitblit v1.9.1