From d170b81d2befd6aa898168bdd68ab8ac04450224 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 三月 2022 14:47:26 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SteThread.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index a3da704..7111554 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -219,8 +219,12 @@
             return false;
         }
         command.setSteNo(slave.getId());
-        short[] array = new short[10];
-//        array[0] = command.getAckFinish();
+        OperateResult result;
+        // 寮�濮嬩换鍔�
+        if (!command.getWaiting()) {
+            OperateResult result0 = siemensS7Net.Write("D0", command.getTaskNo());
+            short[] array = new short[10];
+            array[0] = command.getTaskMode();
 //        array[1] = command.getTaskNo();
 //        array[2] = command.getTaskMode();
 //        array[3] = command.getSourcePosX();
@@ -230,12 +234,13 @@
 //        array[7] = command.getDestinationPosY();
 //        array[8] = command.getDestinationPosZ();
 //        array[9] = command.getCommand();
-        OperateResult result = siemensS7Net.Write("D0", array);
-
-//        if (command.getAckFinish() == 0) {
-//            short commandFinish = 1;
-//            result = siemensS7Net.Write("D9", commandFinish);
-//        }
+            OperateResult result1 = siemensS7Net.Write("D0", array);
+            // 纭寮�濮嬩换鍔�
+            result = siemensS7Net.Write("D0", true);
+        // 浠诲姟瀹屾垚
+        } else {
+            result = siemensS7Net.Write("D0", true);
+        }
 
         try {
             // 鏃ュ織璁板綍

--
Gitblit v1.9.1