From 7990946c72ea48638718cf638c1fb743b239f93e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:00:55 +0800
Subject: [PATCH] 999

---
 src/main/java/com/zy/core/thread/impl/FyDevpThread.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 6db683c..6ada967 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -13,6 +13,7 @@
 import com.zy.core.News;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.IoModeType;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
@@ -40,7 +41,7 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
 
-  public Integer  ioModeOf1F1.
+    public IoModeType ioModeOf2_5 = IoModeType.PAKIN_MODE;
 
     private short heartBeatVal = 1;
     private int barcodeSize = 10;
@@ -135,6 +136,8 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
+        // 鏇存柊鍏ュ嚭搴撴ā寮�
+        updateIoMode();
         int staNoSize = staNos2.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB82.14", (short) (staNoSize * 26));
         if (result.IsSuccess) {
@@ -296,4 +299,20 @@
     }
 
 
+    // 鏇存柊鍏ュ嚭搴撴ā寮�
+    private void updateIoMode() throws InterruptedException {
+        if (this.ioModeOf2_5 != null && (this.ioModeOf2_5.id == 0 || this.ioModeOf2_5.id == 1)) {
+            if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐�", this.ioModeOf2_5));
+                log.error("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", this.ioModeOf2_5);
+            } else {
+                if (station.get(1031) != null) {
+                    station.get(1031).setOutInModel(this.ioModeOf2_5.id);
+                    station.get(1032).setOutInModel(this.ioModeOf2_5.id);
+                }
+            }
+        }
+
+    }
+
 }

--
Gitblit v1.9.1