From b8acabe1015de18b190b70a051c6546a91200b6b Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 01 三月 2023 17:00:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 073e990..823247a 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -179,6 +179,65 @@
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+ //璇诲彇绌挎杞﹁澶囦俊鎭紝鎻愪緵鏌ヨ
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("V732", (short) 16);
+ if (result1.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 15);
+ steProtocol.setLiftErr(status[0]);
+ steProtocol.setInFetchErr(status[2]);
+ steProtocol.setOutFetchErr(status[3]);
+ steProtocol.setAntiErr(status[4]);
+ steProtocol.setLiftSwitchErr(status[5]);
+ steProtocol.setTrackErr(status[6]);
+ steProtocol.setTimeoutErr(status[7]);
+ steProtocol.setConnectErr(status[8]);
+ steProtocol.setEmergencyErr(status[9]);
+ steProtocol.setTaskTypeErr(status[10]);
+ steProtocol.setTaskNoErr(status[11]);
+ steProtocol.setNewTaskErr(status[12]);
+ steProtocol.setErrTaskErr(status[13]);
+ steProtocol.setStopErr(status[14]);
+ steProtocol.setOfflineTaskErr(status[15]);
+ steProtocol.setStartTaskErr(status[16]);
+ steProtocol.setVoltageTaskErr(status[17]);
+
+ steProtocol.setDevpErr(status[63]);
+
+ steProtocol.setOnline(status[64]);
+ steProtocol.setNotOnTrack(status[65]);
+ steProtocol.setLowVoltage(status[66]);
+ steProtocol.setElectricityLoss(status[67]);
+ steProtocol.setForcedTravel(status[68]);
+ steProtocol.setDemoMode(status[69]);
+ steProtocol.setBrushConnect(status[70]);
+ steProtocol.setTaskManualForbid(status[71]);
+ steProtocol.setOnlineManualForbid(status[72]);
+ steProtocol.setDevpEmergency(status[73]);
+ steProtocol.setTaskInterrupt(status[74]);
+ steProtocol.setTaskClear(status[75]);
+ steProtocol.setTaskConfirmTimeout(status[76]);
+ steProtocol.setTaskWithCharge(status[77]);
+
+ steProtocol.setPakInTask(status[96]);
+ steProtocol.setPakOutTask(status[97]);
+ steProtocol.setPakMoveTask(status[98]);
+ steProtocol.setGoHpTask(status[99]);
+ steProtocol.setGoOHpTask(status[100]);
+ steProtocol.setGoHpAvoid(status[101]);
+ steProtocol.setGoOHpAvoid(status[102]);
+ steProtocol.setPakInEmpty(status[104]);
+ steProtocol.setPakInFinish(status[105]);
+ steProtocol.setPakOutEmpty(status[106]);
+ steProtocol.setPakOutFinish(status[107]);
+ steProtocol.setGoHpAvoidFinish(status[108]);
+ steProtocol.setGoOHpAvoidFinish(status[109]);
+ steProtocol.setGoHpAvoidErr(status[110]);
+ steProtocol.setGoOHpAvoidErr(status[111]);
+
+ steProtocol.setAutoMode(status[112]);
+ steProtocol.setVoltageLow(status[113]);
+ }
+
// 澶嶄綅淇″彿
if (steProtocol.getWaiting()) {
if (resetFlag) {
@@ -189,7 +248,6 @@
}
}
}
-
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasSteService service = SpringUtils.getBean(BasSteService.class);
@@ -232,6 +290,9 @@
OperateResult result = null;
// 寮�濮嬩换鍔�
if (!command.getComplete()) {
+ //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
+ siemensS7Net.Write("V2000.0", false);
+ siemensS7Net.Write("V2000.1", false);
// 1.浠诲姟鍙�
OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
try {
--
Gitblit v1.9.1