From c2144e00a981be9093c2b1fe257881203d800810 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 22 六月 2024 16:01:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index baf9974..f3acc49 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -289,20 +289,33 @@
staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
}
}
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-// if (result0.IsSuccess) {
-// for (int i = 0; i < 93; i++) {
-// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
-// }
-// }
+ if (slave.getId()==2){
+ Thread.sleep(200);
+ int[] staNosRgv = {623,624,625,626};
+ for (int i = 0; i < staNosRgv.length; i++) {
+ OperateResultExOne<byte[]> resultRgv = siemensS7Net.Read("DB100."+(1800+i*6), (short) 5);
+ if (resultRgv.IsSuccess) {
+ Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 0)); // 灏忚溅鐩爣浣�
+
+ staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 2)); // 鐩爣绔�
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 4, 1);
+ staProtocol.setRGV1(status[0]); // 鑷姩
+ staProtocol.setRGV2(status[1]); // 鏈夌墿
+ staProtocol.setRGV3(status[2]); // 鍙叆
+ staProtocol.setRGV4(status[3]);// 鍙嚭
+ staProtocol.setRGV5(status[4]); // 绌烘澘淇″彿
+ staProtocol.setRGV6(status[5]); // 婊℃墭鐩�
+ }
+ }
+ }
// Thread.sleep(200);
// OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize * 2));
// if (result1.IsSuccess) {
--
Gitblit v1.9.1