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);