From 1565e56f74f3173bff0998e4ccc67a82b8cddee3 Mon Sep 17 00:00:00 2001 From: miguannan <53815784+javami888@users.noreply.github.com> Date: Wed, 12 Aug 2026 15:41:50 +0700 Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E5=A0=86=E5=9E=9B?= =?UTF-8?q?=E6=9C=BA=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ConveyorWithScannerWeightDeviceDriver.java | 34 +++++++++++++++++++ .../service/quartz/task/CreateDDJInst.java | 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 23a38c0..cb127f2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -794,6 +794,40 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } List keys = Arrays.asList(ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_COMMAND.getKey()); List values = Arrays.asList(getTargetAddress(next_device), Integer.parseInt(inst.getInstruction_code()), 1); + TaskDto taskDto = taskService.findByBarcodeFromCache(queryBarcode); + InteractionJsonDTO interactionJsonDTO; + if (ObjectUtil.isNotEmpty(taskDto)){ + interactionJsonDTO = JSON.parseObject(taskDto.getInteraction_json(), InteractionJsonDTO.class); + if (ObjectUtil.isNotEmpty(interactionJsonDTO)) + { + String containerType = interactionJsonDTO.getContainerType(); + if (StrUtil.isNotBlank(containerType)) { + keys.add(ItemProtocol.TO_CONTAINER_TYPE.getKey()); + values.add(Integer.parseInt(containerType)); + } + String heightLevel = interactionJsonDTO.getHeightLevel(); + if (StrUtil.isNotBlank(heightLevel)) { + keys.add(ItemProtocol.TO_HEIGHT_LEVEL.getKey()); + values.add(Integer.parseInt(heightLevel)); + } + String type = interactionJsonDTO.getType(); + if (StrUtil.isNotBlank(type)) { + keys.add(ItemProtocol.TO_BACK_UP_1.getKey()); + values.add(Integer.parseInt(type)); + } + if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsUncap())) + { + keys.add(ItemProtocol.TO_BACK_UP_2.getKey()); + values.add(Integer.parseInt(interactionJsonDTO.getIsUncap())); + } + if (ObjectUtil.isNotEmpty(interactionJsonDTO.getMaterialBarcode())) + { + keys.add(ItemProtocol.MATERIAL_BARCODE.getKey()); + values.add(interactionJsonDTO.getMaterialBarcode()); + } + } + } + this.writing(keys, values); this.requireSuccess = true; return; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index de1d7d0..4c68663 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -217,11 +217,11 @@ public class CreateDDJInst { Instruction instdto = new Instruction(); if (CollUtil.isEmpty(byDeviceCodes)) { //判断有没有DDJ对接位出入库的指令,只判断终点 - List byCodeAndExcute = instructionService.findByNextCode(next_device_code); + /* List byCodeAndExcute = instructionService.findByNextCode(next_device_code); if (CollUtil.isNotEmpty(byCodeAndExcute)){ // ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("有DDJ对接位为终点的指令"); continue; - } + }*/ instdto.setInstruction_type(task_type); instdto.setInstruction_id(IdUtil.simpleUUID()); instdto.setRoute_plan_code(route_plan_code); @@ -319,11 +319,11 @@ public class CreateDDJInst { if (StrUtil.isNotEmpty(count)) { if (max <= Integer.parseInt(count)) { //判断有没有DDJ对接位出入库的指令,只判断终点 - List byCodeAndExcute = instructionService.findByNextCode(next_device_code); + /* List byCodeAndExcute = instructionService.findByNextCode(next_device_code); if (CollUtil.isNotEmpty(byCodeAndExcute)){ // ((StandardStackerDeviceDriver) deviceByCode.getDeviceDriver()).setNotCreateInstMessage("有DDJ对接位为终点的指令"); continue; - } + }*/ instdto.setInstruction_type(task_type); instdto.setInstruction_id(IdUtil.simpleUUID()); instdto.setRoute_plan_code(route_plan_code);