From f8a1d06420b4a895d83cf14f267ddbb492f8a92a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 十一月 2023 08:29:43 +0800
Subject: [PATCH] #出入库站点检测报警信息
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 6 ------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 774d3b7..9e849a3 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -81,12 +81,6 @@
//鍑哄叆搴撴ā寮�1銆佸叆搴擄紝2銆佸嚭搴�
private Short outInModel;
- //杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔�
- private Integer rotationDire;
-
- //杈撻�佺嚎102绔欏洖閫�淇″彿
- private Integer rollback102;
-
//楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
private Short locType1;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 916e57b..5d4f855 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;
@@ -221,6 +228,23 @@
}
}
+ //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
+ Thread.sleep(100);
+ for (Integer staNo : outInAlarmStaNos) {
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB" + staNo + ".20.0", (short) 2);
+ if (result5.IsSuccess) {
+ 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