From a08610b24b88e3e5cbf1e3e071d67c3818a440cf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 25 十二月 2024 13:18:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    6 +++---
 1 files changed, 3 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 85093a7..40e26a1 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -471,7 +471,7 @@
                 }
                 staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12));     // 宸ヤ綔鍙�
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*12 + 4 ));   // 鐩爣绔�
-                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12 + 6));   // 鐩爣绔�
+                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, i * 12 + 6,20,"UTF-8"));   // 鐩爣绔�
             }
         }
         Thread.sleep(200);
@@ -637,7 +637,7 @@
                 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);
-                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 4);
+                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 4,20, "UTF-8");
                 short amount =  siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 8);
                 String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+10, 20, "UTF-8");
                 short staEnd = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 30);
@@ -718,7 +718,7 @@
                 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);
-                Integer matnr = siemensS7Net.getByteTransform().TransInt32(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");
                 short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);

--
Gitblit v1.9.1