From 5e99301887e7e7e2a2218dbfa3b395a7847f7a82 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 25 十二月 2024 16:57:20 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 24df173..de92dcf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -459,7 +459,7 @@
     private void read10() throws InterruptedException {
         ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 12));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 12 + 78));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -471,7 +471,11 @@
                 }
                 staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12));     // 宸ヤ綔鍙�
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*12 + 4 ));   // 鐩爣绔�
-                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, i * 12 + 284,22,"UTF-8"));   // 鐩爣绔�
+                if (staProtocol.getSiteId() == 2106){
+                    staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content,  284,22,"UTF-8"));   // 鐩爣绔�
+                }
+//                staProtocol.setMatnr("");   // 鐩爣绔�
+
             }
         }
         Thread.sleep(200);
@@ -631,7 +635,7 @@
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
 
-        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*38));
+        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*82));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿

--
Gitblit v1.9.1