From c92a072bf67cf3d38b365290924731a8a5f6f377 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 18 三月 2024 12:59:35 +0800
Subject: [PATCH] #

---
 src/main/resources/application-prod.yml                 |    2 +-
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1280363..632d9f8 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -338,21 +338,16 @@
                 staProtocol.setBarcodeErr(status[6]);
             }
         } else if (slave.getId() == 3) {
-
             //鏉$爜
             //Thread.sleep(200);
             OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
             if (result2.IsSuccess) {
-
                     String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
                     BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 7);
                     if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                         barcodeThread.setBarcode(barcode);
                     }
-
             }
-            // 澶栧舰妫�娴� - 111
-            //Thread.sleep(50);
             OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
             if (result10.IsSuccess) {
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
@@ -364,20 +359,17 @@
                 staProtocol.setRightErr(status[4]);
                 staProtocol.setWeightErr(status[5]);
                 staProtocol.setBarcodeErr(status[6]);
-
             }
         } else if (slave.getId() == 4) {
             //鏉$爜
-            //Thread.sleep(200);
             OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
             if (result2.IsSuccess) {
 
                 String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 7);
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 8);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
                 }
-
             }
             // 澶栧舰妫�娴� - 111
             //Thread.sleep(50);
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 35e5613..5cf7301 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -337,7 +337,7 @@
     inSta[0]: #鍏ュ簱鍙�1
       scale: ${wcs-slave.scale[1].id}
       staNo: 401
-      barcode: ${wcs-slave.barcode[1].id}
+      barcode: ${wcs-slave.barcode[7].id}
       backSta: 400
     outSta[0]: #鍑哄簱鍙�1
       staNo: 407

--
Gitblit v1.9.1