diff --git a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java index 1cfc8cb..203398a 100644 --- a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java +++ b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java @@ -128,7 +128,10 @@ public class CraftsStepService { */ public void finish(CraftsContext craftsContext) throws Exception { HeatModuleCode heatModuleCode = craftsContext.getHeatModuleCode(); - moveToSolutionModule(craftsContext.getHeatModuleCode()); + if ((deviceStateService.getDeviceState().getSolutionModule().getTrayStatus() == 0) + && deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).getTrayStatus() == 1) { + moveToSolutionModule(heatModuleCode); + } heatModuleService.heatRodClose(heatModuleCode);//停止加热 deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setHeatingType(HeatingType.finish); //蜂鸣器提示