From 8fdbc22cbdcde1c420a34d5141c2d8888d05d616 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 1 Nov 2022 09:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/start/auto/run/NDCSocketConnectionAutoRun.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
index fad98bd..09aa200 100644
--- a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
+++ b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
@@ -256,7 +256,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                     //纽迪希亚专用
                                     if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) {
                                         ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver();
-                                        if (ndxySpecialDeviceDriver.getMove() != 0) {
+                                        if (ndxySpecialDeviceDriver.getMove() != 0 && ndxySpecialDeviceDriver.getActoin() != 0) {
                                             inst.setExecute_status("1");
                                             instructionService.update(inst);
                                             data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -487,7 +487,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                     //纽迪希亚专用
                                     if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) {
                                         ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver();
-                                        if (ndxySpecialDeviceDriver.getMove() == 0) {
+                                        if (ndxySpecialDeviceDriver.getMove() == 0 && ndxySpecialDeviceDriver.getActoin() != 0) {
                                             inst.setExecute_status("3");
                                             instructionService.update(inst);
                                             data = AgvService.sendAgvOneModeInst(phase, index, 0);