From 1e5df4a2e55d8fb959311c5da8a1be183adbcd8b Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 11 七月 2024 13:29:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b930438..d4d46d2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -310,9 +310,7 @@
Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
+ continue;
}
try{
staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0)); // 灏忚溅鐩爣浣�
@@ -353,12 +351,19 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) { //1:281 2:292 3:174 4:214 5:120
+ int[] staNosRgv = {281,292,173,214,120};
+
+ for (int i = 0; i < barcodeSize; i++) { //1:281 2:292 3:174(173) 4:214 5:120
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)) {
+ Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ continue;
+ }
+ staProtocol.setBarcode(barcode);
barcodeThread.setBarcode(barcode);
- System.out.println(barcode+"璇诲彇鍒版潯鐮侊細"+i);
}
}
}
--
Gitblit v1.9.1