From 215b98eb8cc24bee55737bb0b07c6428e1bac18a Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期三, 20 八月 2025 13:47:08 +0800
Subject: [PATCH] 联调

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eb91f97..3312f98 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -305,7 +305,7 @@
                     }
                 }*/
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4));   // 鐩爣绔�
-                status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
+                status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 1);
 
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -439,17 +439,17 @@
             return;
         }
         ArrayList<Integer> staNos = getStaNo();
-//        int index = staNos.indexOf(staProtocol.getSiteId());
-        int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
+        int index = staNos.indexOf(staProtocol.getSiteId());
+//        int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
 
         OperateResult write = null;
         OperateResult write1 = null;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            write = siemensS7Net.Write("DB100." + index * 6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
             Thread.sleep(200);
-            write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if(write.IsSuccess && write1.IsSuccess){
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                 break;

--
Gitblit v1.9.1