From 522ac0f93eb315562e6df1aad859fc127db5f4c0 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Thu, 1 Aug 2024 08:52:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=AB=E7=A0=81=E4=BD=8D=E7=BB=88?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E5=8F=B7=E5=88=A4=E6=96=AD=E3=80=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConveyorWithScannerWeightDeviceDriver.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index a81f7c358..632ffa429 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -765,6 +765,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv if (!ObjectUtil.isEmpty(taskdto)) { if (creatInstruction(taskdto)) return false; } else { + message = "未找到补码信息相匹配的任务"; //如果不存在则直接找对应指令直接下发信号 if (pushPLC()) return false; @@ -776,6 +777,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv if (!ObjectUtil.isEmpty(taskdto)) { if (creatInstruction(taskdto)) return false; }else { + message = "未找到载具码信息相匹配的任务"; //如果不存在则直接找对应指令直接下发信号 if (pushPLC()) return false; @@ -909,7 +911,18 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv return true; } Device nextdevice = deviceAppservice.findDeviceByCode(instdto.getNext_device_code()); - + BeltConveyorDeviceDriver beltConveyorDeviceDriver; + if (nextdevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { + beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextdevice.getDeviceDriver(); + String ignorePickupCheck = (String) beltConveyorDeviceDriver.getExtraValue().get("ignore_pickup_check"); + if ("false".equals(ignorePickupCheck)) { + if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) { + log.error("输送机,{}未联机或执行中", instdto.getNext_device_code()); + this.setNotCreateInstMessage("universal_notCreateInstMessage4"); + return false; + } + } + } //创建指令后修改任务状态 taskdto.setTask_status(TaskStatusEnum.BUSY.getIndex()); taskserver.update(taskdto);