From d915705f35f6601083552d56253c1ac061fe3c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Wed, 25 Jun 2025 17:45:32 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A7=BB=E9=99=A4=E6=89=98=E7=9B=98?= =?UTF-8?q?=20=E4=BC=A0=E6=84=9F=E5=99=A8=E6=B2=A1=E6=9C=89=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=88=B0=E6=89=98=E7=9B=98=E5=B0=B1=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=89=98=E7=9B=98=E5=8D=A0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java index ba417bb..ac2fd7e 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java @@ -59,10 +59,14 @@ public class OutTrayCommand extends BaseCommandHandler { if (targetHeatModuleCode == HeatModuleCode.heat_module_04) { throw new AppException(ResultCode.NOT_ALLOWED_HEAT_MODULE);//不允许的加热模块 } + boolean heatTrayExist = deviceSensorService.getTrayStateByHeatModuleCode(targetHeatModuleCode);//获取传感器状态 + if(!heatTrayExist) { + List trayList = deviceStateService.getDeviceState().getTrays(); + trayList.removeIf((tray) -> tray.getHeatModuleCode() != null && tray.getHeatModuleCode().equals(targetHeatModuleCode)); + Assert.isTrue(heatTrayExist, () -> new AppException(ResultCode.TARGET_HEAT_MODULE_NO_TRAY));//加热区无托盘 + } boolean feedTrayExist = deviceSensorService.getSensorStatus(DeviceSensorCode.LIQUID_TRAY_EXIST);//获取上料区托盘状态 Assert.isTrue(!feedTrayExist, () -> new AppException(ResultCode.FEED_AREA_EXIST_TRAY));//上料区不能存在托盘 - boolean heatTrayExist = deviceSensorService.getTrayStateByHeatModuleCode(targetHeatModuleCode);//获取传感器状态 - Assert.isTrue(heatTrayExist, () -> new AppException(ResultCode.TARGET_HEAT_MODULE_NO_TRAY));//加热区无托盘 boolean moduleIdle = deviceStateService.getDeviceState().getTransferModule().isIdle(); if (!moduleIdle) { throw new AppException(ResultCode.CMD_BUSY);//设备忙