From c603e3950b49dab16a4328defde62670546f18c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Sun, 29 Jan 2023 22:04:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=89=A7=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8C=87=E4=BB=A4=E5=BD=93=E5=89=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oven_manipulator/OvenGantryManipulatorDeviceDriver.java | 1 + .../slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java | 3 +++ 2 files changed, 4 insertions(+) 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)) {