From 1a78ba1b06078ad7604ee5cb95aa9d42d7e66561 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 19 十月 2024 15:20:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 0be65f8..35fea73 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -162,17 +162,6 @@
rgvProtocol.setRgvPos(slave.getId().longValue()*100000);
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-// // 宸ヤ綅1澶嶄綅淇″彿
-// if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)) {
-// if (resetFlag1) {
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setAckFinish1((short)1);
-// if (write(rgvCommand)) {
-// resetFlag1 = false;
-// }
-// }
-// }
-
try {
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);
@@ -218,14 +207,12 @@
array[1] = command.getDestinationStaNo1();
array[2] = command.getTaskMode1();//浠诲姟妯″紡
array[3] = command.getTaskNo1();
-// siemensNet.Write("DB100.20", 0);
OperateResult result = siemensNet.Write("DB24.2", array);
if (command.getAckFinish1().equals((short)0)) {
- boolean commandFinish = true; //宸ヤ綅1浠诲姟鍐欏叆
Thread.sleep(100L);
- result = siemensNet.Write("DB24.10.0", commandFinish);
+ result = siemensNet.Write("DB24.10.0", true);
} else {
siemensNet.Write("DB24.10.1", true);
}
--
Gitblit v1.9.1