From 459cd64b2ad755c3448f70019f23664fc9f0fee6 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 3 Mar 2023 18:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oven_manipulator/OvenGantryManipulatorDeviceDriver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);