From 9ff358b13905a756c535bda8f70e30fe29bd2925 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 08:58:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   12 +++++++-----
 1 files changed, 7 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 3390bc2..aae7c02 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -531,15 +531,16 @@
         }
 
         // 绌烘《鍑哄簱淇″彿
-        OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102", (short) 4);
+        OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 18);
         if (readCall.IsSuccess){
             Integer isNeed = siemensS7Net.getByteTransform().TransInt32(result.Content,  0); // IBC瑕佹《淇″彿
             Integer isFinish = siemensS7Net.getByteTransform().TransInt32(result.Content, 2); // IBC鐏岃瀹屾垚淇″彿
             Integer weight = siemensS7Net.getByteTransform().TransInt32(result.Content, 4); // IBC鐏岃閲嶉噷
             Integer isAHalf = siemensS7Net.getByteTransform().TransInt32(result.Content, 6); // IBC鍗婃《鏍囪
-
             isCalled = isNeed;
             isFinish = isFinish;
+            weight = weight;
+            isHalf = isAHalf;
         }
 
         // 瀹屾垚缃愯淇″彿
@@ -760,17 +761,18 @@
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
 
-        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*34));
+        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*78));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
 //                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
-                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 2,20, "UTF-8");
                 short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
-                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
+                String batch = siemensS7Net.getByteTransform().TransString(result.Content,i * 4+ 8, 20, "UTF-8");
                 short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);
                 Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 30);
+                String orderNo = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 34,22, "UTF-8");
+                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 56,22, "UTF-8");
 
 
                 StaProtocol staProtocol = station.get(siteId);

--
Gitblit v1.9.1