diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 26f3d5dbb..ef9e23c77 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -369,7 +369,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         }
                         TaskDto taskDto = taskserver.findByCode(inst2.getTask_code());
 
-                        String next_device_code = taskDto.getNext_device_code();
+                        String next_device_code = inst2.getNext_device_code();
                         //String start_device_code = taskDto.getStart_device_code();
                         //Device startDevice = deviceAppService.findDeviceByCode(start_device_code);
                         Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
@@ -523,7 +523,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     //按照优先级排序 优先级相等按照创建时间排序
                     taskDtos = this.sortTask(taskDtos);
                     TaskDto taskDto = taskDtos.get(0);
-                    Instruction instruction = instructionService.findByTaskcode(taskDto.getTask_code());
+                    Instruction instruction = instructionService.findByTaskcodeAndStatus(taskDto.getTask_code());
                     String start_device_code = instruction.getStart_device_code();
                     String next_device_code = instruction.getNext_device_code();
                     Device nextdevice = deviceAppService.findDeviceByCode(next_device_code);