From d500950add4a43fbd02135a5cb59de0493a8261a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 01 十二月 2023 09:20:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3d874c8..8bcfbd9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -75,6 +75,13 @@
add(341);add(346);
}};
+ //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
+ public static final ArrayList<Integer> outInAlarmStaNos = new ArrayList<Integer>(){{
+ add(101);add(102);add(104);
+ add(201);add(202);add(204);
+ add(340);add(345);
+ }};
+
public boolean charge0;
public boolean charge1;
@@ -180,6 +187,10 @@
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 98);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
+ if (i >= 10) {
+ continue;
+ }
+
String barcode = null;
if (i == 8) {
barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,13, "UTF-8");
@@ -217,6 +228,28 @@
}
}
+ //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
+ Thread.sleep(100);
+ for (Integer staNo : outInAlarmStaNos) {
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB" + staNo + ".20.0", (short) 2);
+ if (result5.IsSuccess) {
+ if (staNo == 101 || staNo == 201) {
+ staNo--;
+ }else {
+ staNo++;
+ }
+ StaProtocol staProtocol = station.get(staNo);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 2);
+ staProtocol.setBarcodeErr(status[4]);//鎵爜澶辫触
+ staProtocol.setFrontErr(status[8]);//鍓嶈秴闄�
+ staProtocol.setBackErr(status[9]);//鍚庤秴闄�
+ staProtocol.setLeftErr(status[10]);//宸﹁秴闄�
+ staProtocol.setRightErr(status[11]);//鍙宠秴闄�
+ staProtocol.setHighErr(status[12]);//瓒呴珮
+ staProtocol.setWeightErr(status[13]);//瓒呴噸
+ }
+ }
+
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1