From 398a0ea330d94bc4df491dd43d7a98662c6a5157 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 06 三月 2023 14:26:23 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5d4dc1f..3664661 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -360,14 +360,58 @@
         } else {
             array[0] = 0;
         }
-        array[1] = command.getSourcePosZ();
-        array[2] = command.getSourcePosY();
-        array[3] = command.getSourcePosX();
-        array[4] = command.getDestinationPosZ();
-        array[5] = command.getDestinationPosY();
-        array[6] = command.getDestinationPosX();
-        array[7] = command.getSourceStaNo();
-        array[8] = command.getDestinationStaNo();
+
+        if (command.getSourcePosZ()==(short)1 && command.getSourcePosY()==(short)1){
+            array[1] = (short)0;
+            array[2] = (short)0;
+        }else if (command.getSourcePosZ()==(short)1 && command.getSourcePosY()==(short)41){
+            array[1] = (short)0;
+            array[2] = (short)42;
+        }else {
+            array[1] = command.getSourcePosZ();
+            array[2] = command.getSourcePosY();
+        }
+
+        if (command.getSourcePosX()==(short)3){
+            array[3] = (short)1;
+        }else if (command.getSourcePosX()==(short)4){
+            array[3] = (short)2;
+        }else {
+            array[3] = command.getSourcePosX();
+        }
+
+        if (command.getDestinationPosZ()==(short)1 && command.getDestinationPosY()==(short)1){
+            array[4] = (short)0;
+            array[5] = (short)0;
+        }else if (command.getDestinationPosZ()==(short)1 && command.getDestinationPosY()==(short)41){
+            array[4] = (short)0;
+            array[5] = (short)42;
+        }else {
+            array[4] = command.getDestinationPosZ();
+            array[5] = command.getDestinationPosY();
+        }
+
+        if (command.getDestinationPosX()==(short)3){
+            array[6] = (short)1;
+        }else if (command.getDestinationPosX()==(short)4){
+            array[6] = (short)2;
+        }else {
+            array[6] = command.getDestinationPosX();
+        }
+        if ((array[1]==(short)0 && array[2] == (short)0) || (array[1]==(short)0 && array[2] == (short)42)){
+            array[7]=(short)1;
+        }else {
+            array[7]=(short)0;
+        }
+//        array[7] = command.getSourceStaNo();
+
+        if ((array[4]==(short)0 && array[5] == (short)0) || (array[4]==(short)0 && array[5] == (short)42)){
+            array[8]=(short)1;
+        }else {
+            array[8]=(short)0;
+        }
+//        array[8] = command.getDestinationStaNo();
+
         // 浣滀笟淇℃伅
         OperateResult result = siemensNet.Write("DB10.0", array);
         // 浠诲姟鍙� + 瀹屾垚浣�

--
Gitblit v1.9.1