From d2d7f4228ebc3bf3942c6407aeaa67889f13931e Mon Sep 17 00:00:00 2001 From: LENOVO <1793460677@qq.com> Date: Mon, 6 May 2024 09:32:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E5=BC=80=E7=9B=96=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java | 2 +- .../org/nl/acs/route/service/impl/RouteLineServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java index a0eff8dc3..964051b87 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java @@ -213,7 +213,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl if (!applyUnbox(instruction)){ if (ObjectUtil.isNotEmpty(instruction)) { try { - instructionService.finish(instruction); +// instructionService.finish(instruction); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java index b9aff96da..d9c6ed52a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java @@ -331,6 +331,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl list = new LambdaQueryChainWrapper<>(routeLineMapper) .eq(RouteLine::getDevice_code, dto.getDevice_code()) .eq(RouteLine::getNext_device_code, dto.getNext_device_code()) + .eq(RouteLine::getRoute_plan_id, dto.getRoute_plan_id()) .list(); if (list.size() == 0) { // wo.insert(json);