From 61d02c1796f3bedc6650e29cc33d9ee85e3a78fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 19 六月 2023 08:07:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index db19743..db8bd9c 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -67,9 +67,17 @@
case 1:
readStatus();
break;
- // 鍐欏叆鏁版嵁
+ // 宸ヤ綅1銆�2鍐欏叆鏁版嵁
case 2:
write((RgvCommand) task.getData());
+ break;
+ //宸ヤ綅1鍐欏叆鏁版嵁
+ case 4:
+ write1((RgvCommand) task.getData());
+ break;
+ //宸ヤ綅2鍐欏叆鏁版嵁
+ case 5:
+ write2((RgvCommand) task.getData());
break;
// 澶嶄綅
case 3:
@@ -180,7 +188,8 @@
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 宸ヤ綅1澶嶄綅淇″彿
- if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)) {
+ if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
+ || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
if (resetFlag1) {
RgvCommand rgvCommand = new RgvCommand();
rgvCommand.setAckFinish1((short)1);
@@ -191,7 +200,8 @@
}
// 宸ヤ綅2澶嶄綅淇″彿
- if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)) {
+ if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
+ || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
if (resetFlag2) {
RgvCommand rgvCommand = new RgvCommand();
rgvCommand.setAckFinish2((short)1);
@@ -306,6 +316,7 @@
array[2] = command.getTaskMode1();
array[3] = command.getSourceStaNo1();
array[4] = command.getDestinationStaNo1();
+ siemensNet.Write("DB100.20", command.getCommand());
OperateResult result = siemensNet.Write("DB100.0", array);
@@ -357,15 +368,14 @@
return false;
}
- siemensNet.Write("DB100.20", command.getCommand());
-
command.setRgvNo(slave.getId());
- short[] array = new short[5];
+ short[] array = new short[6];
array[0] = command.getAckFinish2();
array[1] = command.getTaskNo2();
array[2] = command.getTaskMode2();
array[3] = command.getSourceStaNo2();
array[4] = command.getDestinationStaNo2();
+ array[5] = command.getCommand();
OperateResult result = siemensNet.Write("DB100.10", array);
--
Gitblit v1.9.1