From 8f462a057de469f154b4232361150c81126e931b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 08:35:40 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   19 ++++++++++---------
 1 files changed, 10 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 822dc46..2a26f31 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -360,8 +360,8 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void readsanqi() throws InterruptedException {
-        ArrayList<Integer> staNos = getStaNo();
-        int staNoSize = staNos.size();
+        ArrayList<Integer> staNos = staNos3;
+        int staNoSize = staNos3.size();
 
         //
         OperateResultExOne<byte[]> resultsanqi = siemensS7Net.Read("DB101.120", (short) (staNoSize * 8));
@@ -476,9 +476,10 @@
         OperateResult write = null;
         OperateResult write1 = null;
         int index;
+        int index2 = 0;
         if (staProtocol.getSiteId() >= 310) {
             index = staNos3.indexOf(staProtocol.getSiteId());
-            index = index + 54;
+            index2 = 54;
         } else {
             index = staNos.indexOf(staProtocol.getSiteId());
         }
@@ -507,10 +508,10 @@
             boolean writeFlag = false;
             while (writeCount < 5) {
                 // 鍐�2鍙疯緭閫佺嚎
-                write = siemensS7Net.Write("DB100." + index * 4, array);    // 宸ヤ綔鍙枫�佺洰鏍�
+                write = siemensS7Net.Write("DB100." + (index * 4 + index2), array);    // 宸ヤ綔鍙枫�佺洰鏍�
                 if (write.IsSuccess) {
                     Thread.sleep(200);
-                    OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 4);
+                    OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + (index * 4 + index2), (short) 4);
                     //OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
                     if (readResult.IsSuccess) {
                         short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
@@ -573,14 +574,14 @@
             boolean writeFlag = false;
             while (writeCount < 5) {
                 // 鍐�2鍙疯緭閫佺嚎
-                write = siemensS7Net.Write("DB100." + index * 6, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
+                write = siemensS7Net.Write("DB100." + (index * 6 + index2), staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
                 Thread.sleep(200);
-                write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo());    // 鐩爣绔�
+                write1 = siemensS7Net.Write("DB100." + (index * 6 + 4 + index2), staProtocol.getStaNo());    // 鐩爣绔�
                 if (write.IsSuccess) {
                     Thread.sleep(200);
-                    OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
+                    OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + (index * 6 + index2), (short) 4);
                     Thread.sleep(200);
-                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
+                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4 + index2), (short) 2);
                     //OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
                     if (readResult.IsSuccess && readResult1.IsSuccess) {
                         int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);

--
Gitblit v1.9.1