From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..14b7d60 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 = 9;
+ private int barcodeSize = 10;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);
add(102);add(103);
@@ -66,6 +66,9 @@
add(300);add(341);
add(346);
}};
+
+ public boolean charge0;
+ public boolean charge1;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -171,10 +174,17 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 88);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 98);
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