root/niuDiXiYa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-11-01 09:47:02 +08:00
parent 38432376db
commit 8fdbc22cbd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -256,7 +256,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//纽迪希亚专用 //纽迪希亚专用
if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) {
ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver(); ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver();
if (ndxySpecialDeviceDriver.getMove() != 0) { if (ndxySpecialDeviceDriver.getMove() != 0 && ndxySpecialDeviceDriver.getActoin() != 0) {
inst.setExecute_status("1"); inst.setExecute_status("1");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -487,7 +487,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//纽迪希亚专用 //纽迪希亚专用
if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) {
ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver(); ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver();
if (ndxySpecialDeviceDriver.getMove() == 0) { if (ndxySpecialDeviceDriver.getMove() == 0 && ndxySpecialDeviceDriver.getActoin() != 0) {
inst.setExecute_status("3"); inst.setExecute_status("3");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);