From 904c3bf52d9861330c0ca47748c8202db6ad7e98 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 21 七月 2024 10:18:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   14 +++++++++-----
 1 files changed, 9 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 73697f5..f005729 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 = 9;
+    private int barcodeSize = 5;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -354,11 +354,15 @@
         Thread.sleep(200);
         OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
         if (result2.IsSuccess) {
-            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
+            int[] staNosRgv = new int[]{281,292,173,214,120};
+            if (slave.getId()==2){
+                staNosRgv = new int[]{453,460,508,534,611};
+            }
+            for (int i = 0; i < barcodeSize; i++) {
+                //1:281  2:292  3:174(173) 4:214  5:120
+                //6:453  7:460  8:508 9:534  10:611
                 String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, (i + 1+((slave.getId()-1)*5)));
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
                     StaProtocol staProtocol = station.get(siteId);

--
Gitblit v1.9.1