From 441489a28baf686804757e30e6fbe84676d9ffe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B?= <1063331231@qq.com> Date: Thu, 12 Jun 2025 19:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=87=BA=E6=89=98=E7=9B=98=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=89=98=E7=9B=98?= 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 | 4 ++-- 1 file changed, 2 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 a5b74bc..36c9223 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 @@ -77,10 +77,10 @@ public class OutTrayCommand extends BaseCommandHandler { deviceStateService.getDeviceState().getHeatModuleByCode(targetHeatModuleCode).setTrayStatus(false);//设定目标加热模块托盘状态 //deviceStateService.getDeviceState().getSolutionModule().setFeedAreaTrayStatus(true);//设定上料区托盘状态 List trayList = deviceStateService.getDeviceState().getTrays(); - trayList.removeIf((tray) -> tray.getHeatModuleCode().equals(targetHeatModuleCode)); + trayList.removeIf((tray) -> tray.getHeatModuleCode() != null && tray.getHeatModuleCode().equals(targetHeatModuleCode)); } finally { deviceStateService.getCommandMutexState().get().setTransferCommandExecuting(false); - // deviceStateService.getDeviceState().getTrayByHeatModuleCode(targetHeatModuleCode).setUseArm(false);//使用机械臂标志 + // deviceStateService.getDeviceState().getTrayByHeatModuleCode(targetHeatModuleCode).setUseArm(false);//使用机械臂标志 } }); }