From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index f860ea4..842006e 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -117,7 +117,7 @@
                         write5(command2);
                         break;
                     // 鍙屽伐浣嶅悓鏃朵綔涓�
-                    case 7:
+                    case 9:
                         write9((CrnCommandParam) task.getData());
                         break;
                     default:
@@ -205,6 +205,7 @@
                     crnProtocol = new CrnProtocol();
                     crnProtocol.setCrnNo(slave.getId());
                 }
+                crnProtocol.setCrnNo(slave.getId());
                 crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                 crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                 crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
@@ -615,7 +616,7 @@
             return false;
         }
         command.setCrnNo(slave.getId());
-        short[] array = new short[20];
+        short[] array = new short[22];
         array[0] = command.getAckFinish();
         array[1] = command.getTaskNo();
         array[2] = command.getTaskMode();
@@ -636,6 +637,8 @@
         array[17] = command.getDestinationPosY2();
         array[18] = command.getDestinationPosZ2();
         array[19] = command.getCommand();
+        array[20] = (short)1;
+        array[21] = (short)1;
         OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
         OperateResult result38 = siemensNet.Write("DB100.38", (short)0);
         OperateResult result = siemensNet.Write("DB100.0", array);

--
Gitblit v1.9.1