From e597bd9ea3fb7b51e6abacd02b2ccbf409503d7b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 13 七月 2024 08:54:27 +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 73e04fe..d25aee6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -133,7 +133,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 5;
+    private int barcodeSize = 9;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -310,9 +310,7 @@
                     Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
                     StaProtocol staProtocol = station.get(siteId);
                     if (null == staProtocol) {
-                        staProtocol = new StaProtocol();
-                        staProtocol.setSiteId(siteId);
-                        station.put(siteId, staProtocol);
+                        continue;
                     }
                     try{
                         staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 灏忚溅鐩爣浣�
@@ -351,12 +349,20 @@
 
         //鏉$爜鎵弿鍣�
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.1440",(short)(barcodeSize*8));
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
         if (result2.IsSuccess) {
-            for (int i = 0; i < barcodeSize; i++) {  //1:281  2:292  3:174 4:214  5:120
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
+            int[] staNosRgv = {281,292,173,214,120,100,101,102,103};
+
+            for (int i = 0; i < barcodeSize; i++) {  //1:281  2:292  3:174(173) 4:214  5:120
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+                    if (null == staProtocol) {
+                        continue;
+                    }
+                    staProtocol.setBarcode(barcode);
                     barcodeThread.setBarcode(barcode);
                 }
             }

--
Gitblit v1.9.1