From 7bdb4433cdeff7729611c72a2c4199f0decb99c6 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 15:05:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 92778f0..b0a2fd5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -63,16 +63,15 @@
add(200);add(201);add(202);add(203);
add(204);add(205);add(206);add(207);
add(208);add(209);add(210);add(211);
- add(212);
- add(213);add(214);add(215);add(216);
- add(217);add(218);add(219);add(220);
- add(221);add(222);add(2000);
+ add(212);add(213);add(214);add(215);
+ add(216);add(217);add(218);add(219);
+ add(220);add(221);add(222);add(2000);
}};
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 1;
+ private int barcodeSize = 5;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -120,6 +119,10 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
+// write3((StaProtocol)task.getData());
+// Thread.sleep(400);
+// write4((StaProtocol)task.getData());
+// Thread.sleep(400);
write((StaProtocol)task.getData());
break;
// 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
@@ -129,6 +132,13 @@
// 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴愬浣�
case 4:
write4((StaProtocol)task.getData());
+ break;
+ case 5:
+ write3((StaProtocol)task.getData());
+ Thread.sleep(400);
+ write4((StaProtocol)task.getData());
+ Thread.sleep(400);
+ write((StaProtocol)task.getData());
break;
default:
break;
@@ -237,10 +247,10 @@
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.102",(short)(barcodeSize*10));
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,6, "UTF-8");
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
+ if (result2.IsSuccess && staNoSize==staNos2.size()) {
+ for (int i = 0; i < barcodeSize; i++) { //1:217 2:221 3:null 4:215 5:219
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
@@ -251,7 +261,7 @@
//RGV灏忚溅
Thread.sleep(200);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
- if (result3.IsSuccess) {
+ if (result3.IsSuccess && staNoSize==staNos2.size()) {
Integer siteId = 16;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
--
Gitblit v1.9.1