From 6579f0b743e4d8262fc58fc25f7215aebf2246d1 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 25 七月 2024 10:46:47 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3da01f5..cc4f6c1 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -242,7 +242,7 @@
         }
 //        convertRow(command);
         command.setCrnNo(slave.getId());
-        short[] array = new short[10];
+        short[] array = new short[12];
         array[0] = command.getAckFinish();
         array[1] = command.getTaskNo();
         array[2] = command.getTaskMode();
@@ -252,9 +252,9 @@
         array[6] = command.getDestinationPosX();
         array[7] = command.getDestinationPosY();
         array[8] = command.getDestinationPosZ();
-//        array[9] = command.getSourceStaNo();
-//        array[10] = command.getDestinationStaNo();
-        array[9] = command.getCommand();
+        array[9] = command.getSourceStaNo();
+        array[10] = command.getDestinationStaNo();
+        array[11] = command.getCommand();
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         if (command.getAckFinish() == 0) {
@@ -273,12 +273,12 @@
                     command.getTaskModeType().toString(),    // 妯″紡
                     command.getSourcePosX().intValue(),    // 婧愭帓
                     command.getSourcePosY().intValue(),    // 婧愬垪
-                    command.getSourcePosZ().intValue(),    // 婧愬眰
-                    null,    // 婧愮珯
+                    command.getSourceStaNo().intValue(),    // 婧愬眰
+                    command.getDestinationPosZ().intValue(),    // 婧愮珯
                     command.getDestinationPosX().intValue(),    // 鐩爣鎺�
                     command.getDestinationPosY().intValue(),    // 鐩爣鍒�
                     command.getDestinationPosZ().intValue(),    // 鐩爣灞�
-                    null,    // 鐩爣绔�
+                    command.getDestinationStaNo().intValue(),    // 鐩爣绔�
                     null,    // 鍝嶅簲缁撴灉
                     null,    // 淇敼鏃堕棿
                     null    // 淇敼浜哄憳

--
Gitblit v1.9.1