From f625358f75f92afa61099aa70998b4129898565f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 13 Jun 2025 09:10:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=A7=BB=E8=87=B3=E5=8A=A0=E7=83=AD?= =?UTF-8?q?=E3=80=81=E5=8A=A0=E6=B6=B2=E6=8C=87=E4=BB=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E6=9C=89=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E6=9C=89=E6=89=98?= =?UTF-8?q?=E7=9B=98=EF=BC=8C=E5=BE=85=E5=A2=9E=E5=8A=A0=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E5=90=8E=E4=BD=BF=E7=94=A8=E4=BC=A0=E6=84=9F=E5=99=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iflytop/gd/app/command/control/MoveToHeatAreaCommand.java | 8 ++++---- .../iflytop/gd/app/command/control/MoveToSolutionAreaCommand.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/iflytop/gd/app/command/control/MoveToHeatAreaCommand.java b/src/main/java/com/iflytop/gd/app/command/control/MoveToHeatAreaCommand.java index ff1d45c..4089776 100644 --- a/src/main/java/com/iflytop/gd/app/command/control/MoveToHeatAreaCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/control/MoveToHeatAreaCommand.java @@ -65,10 +65,10 @@ public class MoveToHeatAreaCommand extends BaseCommandHandler { // if (heatModuleTray) { // throw new AppException(ResultCode.TARGET_HEAT_MODULE_OCCUPIED); // } - SolutionModuleState solutionModuleState = deviceStateService.getDeviceState().getSolutionModule(); - if(solutionModuleState.getTrayStatus() == 0){ - throw new AppException(ResultCode.SOLUTION_MODULE_NO_TRAY); - } +// SolutionModuleState solutionModuleState = deviceStateService.getDeviceState().getSolutionModule(); +// if(solutionModuleState.getTrayStatus() == 0){ +// throw new AppException(ResultCode.SOLUTION_MODULE_NO_TRAY); +// } if (trayState != null && trayState.getCrafts() != null) { throw new AppException(ResultCode.CRAFT_RUNNING); } diff --git a/src/main/java/com/iflytop/gd/app/command/control/MoveToSolutionAreaCommand.java b/src/main/java/com/iflytop/gd/app/command/control/MoveToSolutionAreaCommand.java index ead0b85..ae408ea 100644 --- a/src/main/java/com/iflytop/gd/app/command/control/MoveToSolutionAreaCommand.java +++ b/src/main/java/com/iflytop/gd/app/command/control/MoveToSolutionAreaCommand.java @@ -61,10 +61,10 @@ public class MoveToSolutionAreaCommand extends BaseCommandHandler { //校验目标加热位是否有托盘 try { deviceStateService.getCommandMutexState().get().setMoveToSolutionAreaCommandExecuting(true); - HeatModuleState heatModuleState = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode); - if(heatModuleState.getTrayStatus() == 0){ - throw new AppException(ResultCode.TARGET_HEAT_MODULE_NO_TRAY); - } +// HeatModuleState heatModuleState = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode); +// if(heatModuleState.getTrayStatus() == 0){ +// throw new AppException(ResultCode.TARGET_HEAT_MODULE_NO_TRAY); +// } // Boolean heatModuleTray = heatModuleService.heatModuleSensorState(heatModuleCode); // if (!heatModuleTray) { // throw new AppException(ResultCode.TARGET_HEAT_MODULE_NO_TRAY);