From cd874fc904dbd52e3ccb041977f41ea60705dc46 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 20 二月 2023 13:47:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 075c113..3f903d7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -55,7 +55,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 8;
+    private int barcodeSize = 6;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -202,19 +202,21 @@
             }
         }
 
-        //鏉$爜鎵弿鍣�
-        //Thread.sleep(200);
-        //OperateResultExOne<byte[]> result2 = null;
-        //result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*16));
-        //if (result2.IsSuccess) {
-        //    for (int i = 0; i < barcodeSize; i++) {
-        //        String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,8, "UTF-8");
-        //        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId() == 1 ? i + 1 : i + 3);
-        //        if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-        //            barcodeThread.setBarcode(barcode);
-        //        }
-        //    }
-        //}
+//        鏉$爜鎵弿鍣�
+        if(slave.getId() == 2) {
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result2 = null;
+            result2 = siemensS7Net.Read("DB100.200", (short) (barcodeSize * 16));
+            if (result2.IsSuccess) {
+                for (int i = 0; i < barcodeSize; i++) {
+                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 16, 8, "UTF-8");
+                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                        barcodeThread.setBarcode(barcode);
+                    }
+                }
+            }
+        }
 
 //        //RGV灏忚溅
 //        Thread.sleep(200);

--
Gitblit v1.9.1