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

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 40e26a1..24df173 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().TransString(result.Content, i * 12 + 6,20,"UTF-8"));   // 鐩爣绔�
+                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, i * 12 + 284,22,"UTF-8"));   // 鐩爣绔�
             }
         }
         Thread.sleep(200);
@@ -637,12 +637,15 @@
                 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 + 4,20, "UTF-8");
+//                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);
                 short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 32);
                 Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 34);
+                String orderNo = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 38,22, "UTF-8");
+                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 60,22, "UTF-8");
 
 
                 StaProtocol staProtocol = station.get(siteId);

--
Gitblit v1.9.1