From 7cca3a02642588e13644a35e6b995b60fa43c56b Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 02 一月 2023 14:58:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    6 +++---
 src/main/resources/application.yml                      |    3 +--
 2 files changed, 4 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 9a899e7..ffcd9ae 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -205,11 +205,11 @@
         //鏉$爜鎵弿鍣�
         Thread.sleep(200);
         OperateResultExOne<byte[]> result2 = null;
-        result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*8));
+        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*8,8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId() == 1 ? i + 1 : i+ 3);
+                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);
                 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5634c74..074254d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -198,7 +198,6 @@
     # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
       staNo: 111
-
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 100
@@ -215,7 +214,7 @@
       barcode: ${wcs-slave.barcode[1].id}
   # 杈撻�佺嚎2
   devp[1]:
-    id: 1
+    id: 2
     ip: 10.10.10.131
     port: 102
     rack: 0

--
Gitblit v1.9.1