From 282252f9106b340388d9ec1b8730ddea87e6e388 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 16:37:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=8A=A0=E7=83=AD=E6=97=B6=E4=B8=80=E7=9B=B4=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iflytop/gd/app/service/crafts/CraftsStepService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 6e732d7..b2821dc 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 @@ -207,6 +207,7 @@ public class CraftsStepService { log.info("工艺{},抬升加热模块托盘", heatModuleCode); heatModuleService.heaterMotorMove(heatModuleCode, trayLift);//抬升加热模块托盘 heatModuleState.setTrayUp(1);//加热模块托盘升降状态 + heatModuleState.setTargetTemperature(targetTemperature); log.info("工艺{},等待降温", heatModuleCode); while (heatModuleState.getTemperature() - 1 > targetTemperature) { sleep(1); @@ -216,7 +217,6 @@ public class CraftsStepService { heatModuleState.setFanOpen(false); log.info("工艺{},开始加热至目标温度", heatModuleCode); heatModuleService.heatRodOpen(heatModuleCode, targetTemperature); - heatModuleState.setTargetTemperature(targetTemperature); heatModuleState.setStartHeatTime(LocalDateTime.now()); } else { if (heatModuleState.isFanOpen()) { @@ -234,14 +234,16 @@ public class CraftsStepService { heatModuleState.setTargetTemperature(targetTemperature); heatModuleState.setHeatingType(HeatingType.warm_up); log.info("工艺{},等待升温", heatModuleCode); + double delayHeatModuleCode = targetTemperature; if (inTemperature != null) { - while (heatModuleState.getTemperature() + 1 < inTemperature) { - sleep(1); - } - log.info("工艺{},温度达到可以放入的温度，下降加热模块托盘", heatModuleCode); - heatModuleService.heaterMotorMove(heatModuleCode, trayLower);//下降加热模块托盘 - heatModuleState.setTrayUp(0);//加热模块托盘升降状态 + delayHeatModuleCode = inTemperature; } + while (heatModuleState.getTemperature() + 1 < delayHeatModuleCode) { + sleep(1); + } + log.info("工艺{},温度达到可以放入的温度，下降加热模块托盘", heatModuleCode); + heatModuleService.heaterMotorMove(heatModuleCode, trayLower);//下降加热模块托盘 + heatModuleState.setTrayUp(0);//加热模块托盘升降状态 heatModuleState.setStartHeatTime(LocalDateTime.now()); while (heatModuleState.getTemperature() + 1 < targetTemperature) { sleep(1);