From c3298aea8c7ae7d31a8853266735543710707b51 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 04 六月 2025 10:45:08 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/RgvThread.java |   26 ++++++++++++++++++++------
 1 files changed, 20 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 ba56b5f..38eb977 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -112,6 +112,20 @@
                         command.setDestinationStaNo1((short)0);     // 鐩爣绔�
                         write3(command);
                         break;
+                    // 澶嶄綅
+                    case 4:
+                        RgvCommand command4 = (RgvCommand) task.getData();
+                        if (null == command4) {
+                            command4 = new RgvCommand();
+                        }
+                        command4.setRgvNo(slave.getId()); // RGV缂栧彿
+                        command4.setTaskNo1((short) 0); // 宸ヤ綔鍙�
+                        command4.setAckFinish1((short) 1);  // 浠诲姟瀹屾垚纭浣�
+                        command4.setTaskMode1(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
+                        command4.setSourceStaNo1((short)0);     // 婧愮珯
+                        command4.setDestinationStaNo1((short)0);     // 鐩爣绔�
+                        write3(command4);
+                        break;
                     default:
                         break;
                 }
@@ -288,7 +302,7 @@
         if (command.getAckFinish1().equals((short)0)) {
 //            Thread.sleep(100L);
             siemensNet.Write("DB24.10.7", command.getRgvSome() == 1);
-            Thread.sleep(100L);
+            Thread.sleep(20L);
             result = siemensNet.Write("DB24.10.0", true);
         } else {
             siemensNet.Write("DB24.10.1", true);
@@ -315,8 +329,8 @@
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
+//            Thread.sleep(200);
+//            this.readStatus();
             log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
             OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
             return true;
@@ -346,7 +360,7 @@
 //        OperateResult result = siemensNet.Write("DB24.0", array);
         OperateResult result = null;
         if (command.getAckFinish1().equals((short)0)) {
-            Thread.sleep(100L);
+            Thread.sleep(20L);
             result = siemensNet.Write("DB24.10.0", true);
         } else {
             siemensNet.Write("DB24.10.1", true);
@@ -373,8 +387,8 @@
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
+//            Thread.sleep(200);
+//            this.readStatus();
             log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
             OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
             return true;

--
Gitblit v1.9.1