From e4e648039069464f96b3e4abacae167e3a0b3be3 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 04 三月 2023 14:15:40 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 525a2ce..9ce7789 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -226,27 +226,41 @@
             News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
             return false;
         }
+//        siemensNet.Write("DB100.18", (short) 0);
 //        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();
+        if (command.getSourcePosX()==4){
+            array[3] = 1;
+        }else if (command.getSourcePosX()==5){
+            array[3] = 2;
+        }else {
+            array[3] = command.getSourcePosX();
+        }
+
+
         array[4] = command.getSourcePosY();
         array[5] = command.getSourcePosZ();
-        array[6] = command.getDestinationPosX();
+        if (command.getDestinationPosX()==4){
+            array[6] = 1;
+        }else if (command.getDestinationPosX()==5){
+            array[6] = 2;
+        }else {
+            array[6] = command.getDestinationPosX();
+        }
+
         array[7] = command.getDestinationPosY();
         array[8] = command.getDestinationPosZ();
         array[9] = command.getCommand();
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         if (command.getAckFinish() == 0) {
-            if (result.IsSuccess) {
                 short commandFinish = 1;
                 Thread.sleep(300);
                 result = siemensNet.Write("DB100.18", commandFinish);
-            }
         }
 
         try {

--
Gitblit v1.9.1