diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index c2a7c3403..095be7c75 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -115,6 +116,12 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("点位不能为空"); } + String maxHour = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MAX_HOUR").getValue(); + + if (Integer.parseInt(hours) >= Integer.parseInt(maxHour)) { + throw new BadRequestException("设置的最大烘烤时间不能超过"+maxHour+"分钟"); + } + /* * 根据点位判断是 冷却区入烘箱还是暂存区(对接位)入烘箱 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index 2a1a1792a..ecda2dc86 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -78,7 +78,7 @@ cool_ivt_status = 输入.cool_ivt_status ENDOPTION OPTION 输入.product_area <> "" - product_area = 输入.product_area + cool.product_area = 输入.product_area ENDOPTION OPTION 输入.is_used <> "" is_used = 输入.is_used