From 6697e99226c38fef91e1cf28a7b89c127705c55b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 三月 2023 09:21:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 9bc94c7..befab27 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -234,25 +234,26 @@
         }
 //        convertRow(command);
         command.setCrnNo(slave.getId());
-        short[] array = new short[10];
-        array[0] = command.getAckFinish();
-        array[1] = command.getTaskNo();
-        array[2] = command.getTaskMode();
-        array[3] = command.getSourcePosX();
-        array[4] = command.getSourcePosY();
-        array[5] = command.getSourcePosZ();
-        array[6] = command.getDestinationPosX();
-        array[7] = command.getDestinationPosY();
-        array[8] = command.getDestinationPosZ();
-//        array[9] = command.getSourceStaNo();
-//        array[10] = command.getDestinationStaNo();
+//        short[] array = new short[10];
+        short[] array = new short[12];
+        array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
+        array[1] = command.getTaskNo();  // 浠诲姟鍙�
+        array[2] = command.getTaskMode();  // 妯″紡
+        array[3] = command.getSourcePosX(); // 婧愪綅缃帓鍙�
+        array[4] = command.getSourcePosY(); // 婧愪綅缃垪鍙�
+        array[5] = command.getSourcePosZ(); // 婧愪綅缃眰鍙�
+        array[6] = command.getDestinationPosX();  // 鐩爣浣嶇疆鎺掑彿
+        array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
+        array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
         array[9] = command.getCommand();
+        array[10] = command.getLocType1();   //鏂板璐х墿绫诲瀷涓嬪彂
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;
             Thread.sleep(100L);
-            result = siemensNet.Write("DB100.18", commandFinish);
+//            result = siemensNet.Write("DB100.18", commandFinish);
+            result = siemensNet.Write("DB100.22", commandFinish);
         }
 
         try {

--
Gitblit v1.9.1