From d2dbc96d29d4560400bc7184e255a305929f53a5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 19 十月 2024 15:14:06 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 7a15cab..0be65f8 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -72,6 +72,20 @@
case 2:
write((RgvCommand) task.getData());
break;
+ // 澶嶄綅
+ case 3:
+ RgvCommand command = (RgvCommand) task.getData();
+ if (null == command) {
+ command = new RgvCommand();
+ }
+ command.setRgvNo(slave.getId()); // RGV缂栧彿
+ command.setTaskNo1((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
+ command.setSourceStaNo1((short)0); // 婧愮珯
+ command.setDestinationStaNo1((short)0); // 鐩爣绔�
+ write(command);
+ break;
default:
break;
}
@@ -148,17 +162,16 @@
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)
- || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
- if (resetFlag1) {
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setAckFinish1((short)1);
- if (write(rgvCommand)) {
- resetFlag1 = false;
- }
- }
- }
+// // 宸ヤ綅1澶嶄綅淇″彿
+// if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)) {
+// if (resetFlag1) {
+// RgvCommand rgvCommand = new RgvCommand();
+// rgvCommand.setAckFinish1((short)1);
+// if (write(rgvCommand)) {
+// resetFlag1 = false;
+// }
+// }
+// }
try {
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -196,23 +209,25 @@
return false;
}
-// siemensNet.Write("DB100.20", command.getCommand());
+ siemensNet.Write("DB24.10.0", false);
+ siemensNet.Write("DB24.10.1", false);
command.setRgvNo(slave.getId());
- short[] array = new short[5];
- array[0] = command.getAckFinish1();
- array[1] = command.getTaskNo1();
+ short[] array = new short[4];
+ array[0] = command.getSourceStaNo1();
+ array[1] = command.getDestinationStaNo1();
array[2] = command.getTaskMode1();//浠诲姟妯″紡
- array[3] = command.getSourceStaNo1();
- array[4] = command.getDestinationStaNo1();
+ array[3] = command.getTaskNo1();
// siemensNet.Write("DB100.20", 0);
- OperateResult result = siemensNet.Write("DB100.0", array);
+ OperateResult result = siemensNet.Write("DB24.2", array);
- if (command.getAckFinish1() == 0) {
- short commandFinish = 1; //宸ヤ綅1浠诲姟鍐欏叆
+ if (command.getAckFinish1().equals((short)0)) {
+ boolean commandFinish = true; //宸ヤ綅1浠诲姟鍐欏叆
Thread.sleep(100L);
- result = siemensNet.Write("DB100.20", commandFinish);
+ result = siemensNet.Write("DB24.10.0", commandFinish);
+ } else {
+ siemensNet.Write("DB24.10.1", true);
}
try {
--
Gitblit v1.9.1