From 4469d723bcd3332e41603981737bb0e00c4de688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B?= <1063331231@qq.com> Date: Wed, 11 Jun 2025 17:16:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E6=B8=A9=E6=B8=A9=E5=BA=A6=E5=8F=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java | 5 +++-- src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java | 1 + src/main/resources/sql/init.sql | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java b/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java index cd898b1..358b6e1 100644 --- a/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java +++ b/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java @@ -12,6 +12,7 @@ import com.iflytop.sgs.app.model.bo.status.device.TubeState; import com.iflytop.sgs.app.model.entity.Container; import com.iflytop.sgs.app.model.entity.CraftMonitor; import com.iflytop.sgs.app.model.entity.Solutions; +import com.iflytop.sgs.app.model.entity.SystemConfig; import com.iflytop.sgs.app.service.api.*; import com.iflytop.sgs.app.service.device.DeviceLightSoundService; import com.iflytop.sgs.app.service.device.DeviceSensorService; @@ -725,7 +726,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); webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(heatModuleCode.toString(), "机械臂移动至加热区", heatModuleCode)); log.info("工艺{},申请使用转运模块", heatModuleCode); @@ -823,7 +824,7 @@ public class CraftsStepService { log.info("工艺{},散热打开", heatModuleCode); heatModuleService.fanStart(heatModuleCode);//散热打开 deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(true); //设置加热区风扇打开 - while (!codeIsSuitable(heatModuleCode, 100.0)) { + while (!codeIsSuitable(heatModuleCode, coldTemperature)) { delay(5); } log.info("工艺{},散热关闭", heatModuleCode); diff --git a/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java b/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java index ae2daa1..3a24e13 100644 --- a/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java +++ b/src/main/java/com/iflytop/sgs/common/enums/SystemConfigCode.java @@ -18,6 +18,7 @@ public enum SystemConfigCode { liquid_max_speed("蠕动泵最大转速限制"), door_origin_is_ignore("忽略门自检"), crafts_end_beep_times("工艺结束蜂鸣器响次数"), + fan_stop_temperature("风扇关闭的温度设置") ; private final String description; diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index b3834bd..eab0a4b 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -57,6 +57,7 @@ INSERT OR IGNORE INTO system_config ("id", "name", "code", "value", "create_time INSERT OR IGNORE INTO system_config ("id", "name", "code", "value", "create_time", "update_time") VALUES (9, '蠕动泵最大转速限制', 'liquid_max_speed', '150', '2025-05-28 13:30:45', '2025-05-28 13:30:45'); INSERT OR IGNORE INTO system_config ("id", "name", "code", "value", "create_time", "update_time") VALUES (10, '忽略门自检', 'door_origin_is_ignore', 'true', '2025-05-29T14:23:48', '2025-05-29T14:23:48'); INSERT OR IGNORE INTO system_config ("id", "name", "code", "value", "create_time", "update_time") VALUES (11, '工艺结束蜂鸣器次数', 'crafts_end_beep_times', '3', '2025-06-04 19:06:55.000', '2025-06-04 19:06:56.000'); +INSERT OR IGNORE INTO system_config ("id", "name", "code", "value", "create_time", "update_time") VALUES (12, '风扇关闭的温度设置', 'fan_stop_temperature', '110.0', '2025-06-04 19:06:55.000', '2025-06-04 19:06:56.000');