From b44b85a4d7512615b8c19c95dc21e537a15a0d5b Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期四, 08 五月 2025 09:37:01 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 70a9fef..dab59c9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -768,11 +768,11 @@
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
 //                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
                 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").trim();
                 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");
+                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 56,22, "UTF-8").trim();
 
 
                 StaProtocol staProtocol = station.get(siteId);
@@ -843,7 +843,7 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
             Thread.sleep(200);
             write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if(write.IsSuccess && write1.IsSuccess){
@@ -885,12 +885,18 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+             write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
             Thread.sleep(100);
-            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+             write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo());    // 鐩爣绔�
             Thread.sleep(100);
-            write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
-            if(write.IsSuccess && write1.IsSuccess){
+             write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
+
+//            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+
+//            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+
+//            write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
+            if(write.IsSuccess && write1.IsSuccess && write2.IsSuccess){
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                 break;
             }

--
Gitblit v1.9.1