退火后降温

src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java

@@ -223,13 +223,28 @@ public class CraftsStepService {
 
             /*移动至加热区*/
             boolean heatModuleTrayExist = deviceSensorService.getTrayStateByHeatModuleCode(heatModuleCode);//目标加热模块有无托盘
-            //Assert.isTrue(!heatModuleTrayExist, () -> new AppException(ResultCode.TARGET_HEAT_MODULE_OCCUPIED));//提示被占用
+            Assert.isTrue(!heatModuleTrayExist, () -> new AppException(ResultCode.TARGET_HEAT_MODULE_OCCUPIED));//提示被占用
             webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(heatModuleCode.toString(), "机械臂移动至加热区", heatModuleCode));
             log.info("工艺{},加液机械臂上升", heatModuleCode);
             solutionModuleService.solutionMotorMoveZero();//加液机械臂上升
             log.info("工艺{},将X轴移动至目标加热模块托盘夹取点", heatModuleCode);
             transferModuleService.transferXMove(heatModuleTrayClawPoint3D.getX());//将X轴移动至目标加热模块托盘夹取点
             log.info("工艺{},Z轴下降至夹取点", heatModuleCode);
+            //判断温度
+            Double coldTemperature=systemConfigService.getSystemConfigDoubleByCode(SystemConfigCode.fan_stop_temperature);//降温至
+            double currentTemperature = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).getTemperature();
+            if(currentTemperature>coldTemperature){
+                log.info("工艺{},散热打开", heatModuleCode);
+                heatModuleService.fanStart(heatModuleCode);//散热打开
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(true); //设置加热区风扇打开
+                while (!codeIsSuitable(heatModuleCode, coldTemperature)) {
+                    delay(5);
+                }
+                log.info("工艺{},散热关闭", heatModuleCode);
+                heatModuleService.fanClose(heatModuleCode);//散热关闭
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(false); //设置加热区风扇关闭
+            }
+
             transferModuleService.transferZMove(heatModuleTrayClawPoint3D.getZ());//Z轴下降至夹取点，使托盘落入石墨加热盘
             log.info("工艺{},X轴移出卡槽", heatModuleCode);
             transferModuleService.transferXMoveBy(transferModuleXPickTrayMoveDistance);//X轴移出卡槽
@@ -441,8 +456,13 @@ public class CraftsStepService {
         craftMonitorService.saveOrUpdate(craftMonitor);
         /*工艺监控清理上步的记录*/
 
+
+
         Double temperature = params.getDouble("temperature");//温度
         Integer time = params.getInt("time");//秒
+
+
+
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setHeatingType(HeatingType.heating); //设置加热区状态 加热中
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setTargetTemperature(temperature);//将加热温度设定为目标温度
         log.info("工艺{},开始加热", heatModuleCode);
@@ -702,6 +722,8 @@ public class CraftsStepService {
         log.info("工艺{},关闭加热棒", heatModuleCode);
         webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(heatModuleCode.toString(), "关闭加热棒", ""));
         heatModuleService.heatRodClose(heatModuleCode);//关闭加热棒
+        heatModuleService.fanStart(heatModuleCode);//散热打开
+        deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(true); //设置加热区风扇打开
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setStartHeatTime(null);//开始加热时间
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setTargetTime(null);//加热器目标加热时间
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setHeatingType(HeatingType.stop); //设置加热区状态
@@ -726,8 +748,7 @@ public class CraftsStepService {
             Point3D annealTrayClawPoint3D = heatModuleService.getHeatModuleTrayClawPoint3D(HeatModuleCode.heat_module_04);//获取退火区托盘夹取点
             Point3D heatModuleTrayClawPoint3D = heatModuleService.getHeatModuleTrayClawPoint3D(heatModuleCode);//获取目标加热模块托盘夹取点
             Double transferModuleXPickTrayMoveDistance = devicePositionService.getPosition(DevicePositionCode.transferModuleXPickTrayMoveDistance).getDistance();//获取转运模块X轴拿取托盘进出卡槽移动距离
-            Double coldTemperature=systemConfigService.getSystemConfigDoubleByCode(SystemConfigCode.fan_stop_temperature);//降温至
-            log.info("工艺{},机械臂移动至加热区", heatModuleCode);
+          log.info("工艺{},机械臂移动至加热区", heatModuleCode);
             webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(heatModuleCode.toString(), "机械臂移动至加热区", heatModuleCode));
             log.info("工艺{},申请使用转运模块", heatModuleCode);
             transferModuleService.requestTransferModule(CraftsTransferTypeCode.move_anneal);//申请使用转运模块
@@ -821,15 +842,6 @@ public class CraftsStepService {
             deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setTrayStatus(true);//加热区托盘状态
             deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setTrayStatus(false);
             deviceStateService.getDeviceState().getTrayByHeatModuleCode(heatModuleCode).setInHeatModule(true);//托盘状态
-            log.info("工艺{},散热打开", heatModuleCode);
-            heatModuleService.fanStart(heatModuleCode);//散热打开
-            deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(true); //设置加热区风扇打开
-            while (!codeIsSuitable(heatModuleCode, coldTemperature)) {
-                delay(5);
-            }
-            log.info("工艺{},散热关闭", heatModuleCode);
-            heatModuleService.fanClose(heatModuleCode);//散热关闭
-            deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(false); //设置加热区风扇关闭
             deviceLightSoundService.openBeep(CmdBeepMode.info);
             delay(2);
             deviceLightSoundService.closeBeep();