From db7dd6399b3cb28a6cfc219abfd730dba294829d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 20 十月 2023 14:43:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d539373..e184c27 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -67,6 +67,9 @@
add(346);
}};
+ public boolean charge0;
+ public boolean charge1;
+
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
}
@@ -174,7 +177,14 @@
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 88);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ String barcode = null;
+ if (i == 8) {
+ barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,13, "UTF-8");
+ } else if (i == 9) {
+ barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8 + 6,13, "UTF-8");
+ } else {
+ 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);
--
Gitblit v1.9.1