From 7ea081db310d54d3a83c3bea61febb397d67b0f7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 20 十月 2024 13:57:48 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/RgvThread.java             |   13 +++++++------
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 23b5f5b..6867935 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -158,6 +158,7 @@
                     RgvCommand rgvCommand = new RgvCommand();
                     rgvCommand.setRgvNo(rgvProtocol.getRgvNo());
                     rgvCommand.setAckFinish1((short) 0);  // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
+                    rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue());
                     rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡:  鍙栨斁璐�
                     rgvCommand.setSourceStaNo1(wrkMast.getSourceStaNo().shortValue());   //宸ヤ綅1璧风偣
                     rgvCommand.setDestinationStaNo1(wrkMast.getStaNo().shortValue());   //宸ヤ綅1鐩爣绔欑偣
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index e8d13cc..c4edc97 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -203,13 +203,14 @@
         siemensNet.Write("DB24.10.1", false);
 
         command.setRgvNo(slave.getId());
-        short[] array = new short[4];
-        array[0] = command.getSourceStaNo1();
-        array[1] = command.getDestinationStaNo1();
-        array[2] = command.getTaskMode1();//浠诲姟妯″紡
-        array[3] = command.getTaskNo1();
+        short[] array = new short[5];
+        array[0] = command.getRgvNo().shortValue();
+        array[1] = command.getSourceStaNo1();
+        array[2] = command.getDestinationStaNo1();
+        array[3] = command.getTaskMode1();//浠诲姟妯″紡
+        array[4] = command.getTaskNo1();
 
-        OperateResult result = siemensNet.Write("DB24.2", array);
+        OperateResult result = siemensNet.Write("DB24.0", array);
 
         if (command.getAckFinish1().equals((short)0)) {
             Thread.sleep(100L);

--
Gitblit v1.9.1