From 25625413f38206b155140f2a0a413a0bbbcae1cc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 10 一月 2024 16:19:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c91ab8c..5008cf0 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -62,7 +62,8 @@
add(148);add(149);add(150);add(151);
add(152);add(153);add(154);add(155);
add(156);add(157);add(158);add(159);
- add(160);
+ add(160);add(161);
+ add(200);add(201);add(202);
}};
@@ -208,7 +209,7 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.2", (short) (staNoSize * 4));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 4));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -253,33 +254,13 @@
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0",(short)(barcodeSize*8));
- if (result2.IsSuccess && 1!=1) {
- if (slave.getId()==1){
- for (int i = 0; i < barcodeSize/3; 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)){
+ 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, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
- barcodeThread.setBarcode(barcode);
- }
- }
- }else if (slave.getId()==2){
- for (int i = barcodeSize/3; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-barcodeSize/3)*8,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
-// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
- barcodeThread.setBarcode(barcode);
- }
- }
- }else if (slave.getId()==3){
- for (int i = barcodeSize/3+1; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-(barcodeSize/3)*2)*8,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
-// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
- barcodeThread.setBarcode(barcode);
- }
+ barcodeThread.setBarcode(barcode);
}
}
}
--
Gitblit v1.9.1