From b5fbc6a515b0f4cbd44f051403ee8cb7584a025a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B?= <1063331231@qq.com> Date: Thu, 12 Jun 2025 19:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=AD=A3=E5=9C=A8=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=B8=AD=EF=BC=8C=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iflytop/sgs/app/service/api/CraftsService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java index 151d461..29bdc91 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java @@ -95,17 +95,17 @@ public class CraftsService extends ServiceImpl { if (startCraftsDTO.getHeatId() == null) { //如果没有指定加热区id，则自动获取一个 HeatModuleState heatModuleState = heatModuleService.getIdleHeatModule(); - if (heatModuleState == null) { + if (heatModuleState == null || heatModuleState.getModuleCode().equals(HeatModuleCode.heat_module_04)) { log.error("自动分配工艺失败，无空闲加热模块。"); throw new AppException(ResultCode.HEAT_MODULE_NO_IDLE); } else { heatModuleCode = heatModuleState.getModuleCode(); } } else { -// if (futureMap.containsKey(heatModuleCode)) {//校验指定加热模块是否正在执行工艺 -// log.error("工艺正在执行中，不可重复开始执行。"); -// throw new AppException(ResultCode.CRAFT_RUNNING); -// } + if (futureMap.containsKey(heatModuleCode)) {//校验指定加热模块是否正在执行工艺 + log.error("工艺正在执行中，不可重复开始执行。"); + throw new AppException(ResultCode.CRAFT_RUNNING); + } } craftMonitor.setHeatId(heatModuleCode); craftMonitorService.save(craftMonitor);