From 24393cdbdcc3f3e921050e733bd6a27208d4ea55 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 09 五月 2023 12:48:54 +0800
Subject: [PATCH] console.html fixed
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index edce7b1..989a770 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,8 +45,8 @@
private int barcodeSize = 2;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);add(102);
- add(200);add(201);add(202);
- add(300);add(301);add(302);
+ add(103);add(104);add(105);
+ add(106);add(107);add(108);
}};
public boolean charge0;
@@ -181,12 +181,26 @@
charge1 = status[0];
}
-// // 澶栧舰妫�娴� - 102
+ // 澶栧舰妫�娴� - 102
+ Thread.sleep(50);
+ OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB102.110", (short)1);
+ if (result102.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result102.Content, 0, 1);
+ StaProtocol staProtocol = station.get(102);
+ staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
+ staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
+ staProtocol.setHighErr(status[2]);// 楂樿秴闄�
+ staProtocol.setLeftErr(status[3]);// 宸﹁秴闄�
+ staProtocol.setRightErr(status[4]);// 鍙宠秴闄�
+ staProtocol.setWeightErr(status[5]); // 瓒呴噸
+ staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
+ }
+// // 澶栧舰妫�娴� - 201
// Thread.sleep(50);
-// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.129", (short)1);
-// if (result4.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
-// StaProtocol staProtocol = station.get(102);
+// OperateResultExOne<byte[]> result201 = siemensS7Net.Read("DB102.112", (short)1);
+// if (result201.IsSuccess) {
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(result201.Content, 0, 1);
+// StaProtocol staProtocol = station.get(201);
// staProtocol.setFrontErr(status[0]);
// staProtocol.setBackErr(status[1]);
// staProtocol.setHighErr(status[2]);
@@ -195,12 +209,12 @@
// staProtocol.setWeightErr(status[5]);
// staProtocol.setBarcodeErr(status[6]);
// }
-// // 澶栧舰妫�娴� - 203
+// // 澶栧舰妫�娴� - 301
// Thread.sleep(50);
-// OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB102.130", (short)1);
-// if (result5.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
-// StaProtocol staProtocol = station.get(202);
+// OperateResultExOne<byte[]> result301 = siemensS7Net.Read("DB102.114", (short)1);
+// if (result301.IsSuccess) {
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(result301.Content, 0, 1);
+// StaProtocol staProtocol = station.get(301);
// staProtocol.setFrontErr(status[0]);
// staProtocol.setBackErr(status[1]);
// staProtocol.setHighErr(status[2]);
@@ -209,9 +223,9 @@
// staProtocol.setWeightErr(status[5]);
// staProtocol.setBarcodeErr(status[6]);
// }
+
if (result.IsSuccess && result1.IsSuccess) {
-
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
--
Gitblit v1.9.1