From fb8419ef141e16b8ec8b1d9802fa0d5a46768794 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 08:24:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index cf3791d..4d6efab 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -41,7 +41,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- private int barcodeSize = 1;
+ private int barcodeSize = 9;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);
add(102);add(103);
@@ -170,32 +170,15 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)24);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 72);
if (result2.IsSuccess) {
- for (int i = 0; i <= barcodeSize; i++) {
-// byte[] bytes = siemensS7Net.getByteTransform().TransByte(result2.Content, i * 8, 8);
-// String barcode = CommonUtils.bytesToBarcode(bytes);
+ 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, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
}
- }
-
- // 鍏呯數淇″彿浣�1
- Thread.sleep(50);
- OperateResultExOne<byte[]> result32 = siemensS7Net.Read("DB102.109", (short)1);
- if (result32.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result32.Content, 0, 1);
- charge0 = status[0]; //1:鍙互鍏呯數 0锛氬彲鑳界绾� 鍙兘鍦ㄥ厖鐢�
- }
- // 鍏呯數淇″彿浣�2
- Thread.sleep(50);
- OperateResultExOne<byte[]> result31 = siemensS7Net.Read("DB100.201", (short)1);
- if (result31.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result31.Content, 0, 1);
- charge1 = status[0];
}
// 澶栧舰妫�娴� - 102
--
Gitblit v1.9.1