From 5ac80d6a06f686a62c307c52c652e511e3896fb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 16:44:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 11 ++++++-----
1 files changed, 6 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 d258bd5..30e8f67 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -73,7 +73,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 3;
+ private int barcodeSize = 7;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -232,20 +232,21 @@
}
}
+
+ if (slave.getId() == 1){
//鏉＄爜
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.100",(short)31);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.102",(short)60);
if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
+ for (int i = 0; i < 6; i++) {
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)) {
barcodeThread.setBarcode(barcode);
}
}
-
}
- if (slave.getId() == 1){
+
// 澶栧舰妫�娴� - 102
Thread.sleep(100);
OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.150", (short)1);
--
Gitblit v1.9.1