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 23517ed3b..22b41ed55 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 @@ -163,6 +163,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (inst1 != null) { if (StrUtil.equals(inst1.getInstruction_status(), "0")) { inst1.setInstruction_status("1"); + inst1.setExecute_device_code(this.device_code); instructionService.update(inst1); // TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); // if (ObjectUtil.isNotEmpty(taskDto)) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index e4b19a71f..e8325c852 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -213,6 +213,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (StrUtil.equals(inst1.getInstruction_status(), "0")) { //当前执行步骤为更新任务状态 inst1.setInstruction_status("1"); + inst1.setExecute_device_code(this.getDevice_code()); instructionService.update(inst1); // TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); // if (!ObjectUtil.isEmpty(taskDto)) { @@ -240,6 +241,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl //当前指令更新状态 now_steps_type2 = 1; inst2.setInstruction_status("1"); + inst2.setExecute_device_code(this.device_code); instructionService.update(inst2); // TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); // if (!ObjectUtil.isEmpty(taskDto)) { @@ -266,6 +268,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (StrUtil.equals(inst2.getInstruction_status(), "0")) { //当前指令更新状态 inst2.setInstruction_status("1"); + inst2.setExecute_device_code(this.device_code); instructionService.update(inst2); // TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); // if (!ObjectUtil.isEmpty(taskDto)) {