From b0ad26731bd76110d4c5d0ba414efcb1e99a7df8 Mon Sep 17 00:00:00 2001
From: tqs <546479841@QQ.COM>
Date: 星期二, 10 一月 2023 11:08:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1c0c6f7..d00dcb1 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -258,7 +258,8 @@
for (int i = 0; i < barcodeSize/2; 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(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)
+ && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
barcodeThread.setBarcode(barcode);
}
}
@@ -266,7 +267,8 @@
for (int i = barcodeSize/2; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-barcodeSize/2)*8,8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)
+ && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
barcodeThread.setBarcode(barcode);
}
}
--
Gitblit v1.9.1