From d39480501976a24d3749048e728e80cb1d01145b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 二月 2023 19:38:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f4417ad..6ba2110 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -204,18 +204,18 @@
}
//鏉＄爜鎵弿鍣�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = null;
- result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*16));
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId() == 1 ? i + 1 : i + 3);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
- }
- }
+ //Thread.sleep(200);
+ //OperateResultExOne<byte[]> result2 = null;
+ //result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*16));
+ //if (result2.IsSuccess) {
+ // for (int i = 0; i < barcodeSize; i++) {
+ // String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,8, "UTF-8");
+ // BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId() == 1 ? i + 1 : i + 3);
+ // if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ // barcodeThread.setBarcode(barcode);
+ // }
+ // }
+ //}
// //RGV灏忚溅
// Thread.sleep(200);
--
Gitblit v1.9.1