From 1c6a5b04174974ed216664605ea63b282030a50c Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Fri, 29 May 2026 10:38:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=8C=87=E4=BB=A4=E5=A4=B1=E8=B4=A5=E4=B8=8D=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E7=94=B5=E6=B0=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SlitTwoManipulatorDeviceDriver.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 93e1ef3a2..5db7c8b23 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -392,11 +392,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } if (!ObjectUtil.isEmpty(task)) { - this.executeReadyTask(task); + boolean flag = this.executeReadyTask(task); + return flag; } else { notCreateInstMessage = "universal_notCreateInstMessage"; + return false; } - return true; } } @@ -448,11 +449,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } } if (!ObjectUtil.isEmpty(task)) { - this.executeReadyTask(task); + boolean flag1 = this.executeReadyTask(task); + return flag1; } else { notCreateInstMessage = "universal_notCreateInstMessage"; + return false; } - return true; } } @@ -597,6 +599,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl instructionService.create(instdto); } catch (Exception e) { logServer.deviceExecuteLog(device_code, "", instdto.getInstruction_code(), "->" + e.getMessage()); + return false; } //创建指令后修改任务状态 taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex());