From bcd4e611a77fcb65dfc7bc1aacf26eb68095293f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 19 七月 2025 09:42:57 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 627bb17..facc3d0 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -388,7 +388,7 @@
                 for (int i = 0; i < staNosInSize; i++) {
                     Integer siteId = staNosIns.get(i);
                     StaProtocol staProtocol = station.get(siteId);
-                    staProtocol.setStamp(siemensS7Net.getByteTransform().TransInt32(result.Content, i*6));
+                    staProtocol.setStamp( siemensS7Net.getByteTransform().TransInt16(resultIn.Content, i*6));
                 }
             }
 
@@ -484,21 +484,23 @@
         if(resultIn.IsSuccess){
             for (int i = 0; i < staNosInSize; i++) {
                 Integer siteId = staNosIns.get(i);
-                if(staProtocol.getSiteId() == siteId){
-                    offset = i;
+                if(staProtocol.getSiteId().equals(siteId)){
+                    offset = i*6 + 2;
+                    break;
                 }
             }
         }
         do {
-            write = siemensS7Net.Write("DB1000." + offset*6 + 2,staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            write = siemensS7Net.Write("DB1000.0" + offset,staProtocol.getWorkNo());    // 宸ヤ綔鍙�
 
             if(write.IsSuccess ){
-                log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                log.error("鍐欏叆宸ヤ綔鍙穥}",staProtocol.getWorkNo());
+                log.error("鍐欏叆杈撳懡浠ゆ垚鍔熴�傝緭閫佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}", slave.getId(), writeCount);
                 break;
             }
             else {
                 writeCount++;
-                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                log.error("鍐欏叆鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
         }while (writeCount<5);
     }

--
Gitblit v1.9.1