From 9f9961b2061f7abb44ff69083154403a15e26363 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 16 八月 2024 16:38:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 44 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 1f3dd61..eac5390 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -77,6 +77,12 @@
      */
     public IoModeType ioModeOf1F = IoModeType.NONE;
     public IoModeType ioModeOf2F = IoModeType.NONE;
+    public IoModeType ioModeOf3F = IoModeType.NONE;
+    public short ioModeOf3FX = 0;
+    public short ioModeOf3FD = 0;
+    public IoModeType ioModeOf4F = IoModeType.NONE;
+    public short ioModeOf4FX = 0;
+    public short ioModeOf4FD = 0;
 
     private ArrayList<Integer> getStaNo() {
         switch (slave.getId()) {
@@ -179,6 +185,19 @@
                     station.put(siteId, staProtocol);
                 }
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
+            }
+        }
+        if (slave.getId()!=1){
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result2F = siemensS7Net.Read("DB102.50", (short) (4));
+            if (result2F.IsSuccess) {
+                if (slave.getId()==2){
+                    this.ioModeOf3FX = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 0);
+                    this.ioModeOf3FD = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 2);
+                } if (slave.getId()==3){
+                    this.ioModeOf4FX = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 0);
+                    this.ioModeOf4FD = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 2);
+                }
             }
         }
         Thread.sleep(200);
@@ -416,16 +435,32 @@
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
-        if (this.ioModeOf1F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                News.error("鍐欏叆杈撻�佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+        if (slave.getId()==1){
+            if (this.ioModeOf1F != IoModeType.NONE) {
+                if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F.id).IsSuccess) {
+                    OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                    News.error("鍐欏叆杈撻�佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+                }
             }
-        }
-        if (this.ioModeOf2F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.182", this.ioModeOf2F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                News.error("鍐欏叆杈撻�佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            if (this.ioModeOf2F != IoModeType.NONE) {
+                if (!siemensS7Net.Write("DB100.182", this.ioModeOf2F.id).IsSuccess) {
+                    OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                    News.error("鍐欏叆杈撻�佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+                }
+            }
+        } else if (slave.getId()==2){
+            if (this.ioModeOf3F != IoModeType.NONE && this.ioModeOf3F.id/2 != this.ioModeOf3FX) {
+                if (!siemensS7Net.Write("DB102.50", (short) (this.ioModeOf3F.id/2)).IsSuccess) {
+                    OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎113鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                    News.error("鍐欏叆杈撻�佺嚎113鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+                }
+            }
+        } else if (slave.getId()==3){
+            if (this.ioModeOf4F != IoModeType.NONE  && this.ioModeOf4F.id/2 != this.ioModeOf4FX) {
+                if (!siemensS7Net.Write("DB102.50", (short) (this.ioModeOf4F.id/2)).IsSuccess) {
+                    OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎213鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                    News.error("鍐欏叆杈撻�佺嚎213鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+                }
             }
         }
     }

--
Gitblit v1.9.1