diff --git a/src/main/java/com/spring/modules/schedule/mapper/BaseConfigDataMapper.java b/src/main/java/com/spring/modules/schedule/mapper/BaseConfigMapper.java similarity index 64% rename from src/main/java/com/spring/modules/schedule/mapper/BaseConfigDataMapper.java rename to src/main/java/com/spring/modules/schedule/mapper/BaseConfigMapper.java index fd3b254..d37e706 100644 --- a/src/main/java/com/spring/modules/schedule/mapper/BaseConfigDataMapper.java +++ b/src/main/java/com/spring/modules/schedule/mapper/BaseConfigMapper.java @@ -12,7 +12,7 @@ import java.util.List; * @version 1.0 */ @Mapper -public interface BaseConfigDataMapper { +public interface BaseConfigMapper { /** * @description: 查询结果集 @@ -28,5 +28,14 @@ public interface BaseConfigDataMapper { * @date 2024/6/6 17:42 * @version 1.0 */ - List getTblBaseDataByType(BaseConfigData BaseConfigData); + List getBaseConfigList(BaseConfigData BaseConfigData); + + /** + * @description: 查询单个配置的对象参数 + * @author LR + * @date 2024/6/13 14:00 + * @version 1.0 + */ + BaseConfigData getSingleBaseConfig(BaseConfigData BaseConfigData); + } \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java index 5661501..d0d498c 100644 --- a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -3,6 +3,7 @@ package com.spring.modules.schedule.service.impl; import com.spring.common.exception.XJException; import com.spring.common.utils.DateUtils; import com.spring.modules.schedule.data.*; +import com.spring.modules.schedule.mapper.BaseConfigMapper; import com.spring.modules.schedule.mapper.ProcedureMapper; import com.spring.modules.schedule.mapper.ScheduleMapper; import com.spring.modules.schedule.service.ScheduleService; @@ -21,6 +22,8 @@ public class ScheduleServiceImpl implements ScheduleService { private ScheduleMapper scheduleMapper; @Autowired private ProcedureMapper procedureMapper; + @Autowired + private BaseConfigMapper baseConfigMapper; @Override public List getProduceScheduleData(SearchScheduleData inData) { @@ -105,7 +108,8 @@ public class ScheduleServiceImpl implements ScheduleService { throw new RuntimeException("当前材料料号:"+rmPartNo+"不能用于制造成品料号:"+partNo+"!"); } BaseConfigData searchConfig = new BaseConfigData(site, "die_cutting", "check_out_flag"); - String checkOutStockFlag = searchConfig.getBaseData(); + BaseConfigData baseConfig = baseConfigMapper.getSingleBaseConfig(searchConfig); + String checkOutStockFlag = baseConfig.getBaseData(); //查询是否开启了时间空值的校验 if("Y".equalsIgnoreCase(checkOutStockFlag)){ //调用存储过程 检查出库的卷是否符合当前的要求 diff --git a/src/main/resources/mapper/schedule/BaseConfigDataMapper.xml b/src/main/resources/mapper/schedule/BaseConfigMapper.xml similarity index 65% rename from src/main/resources/mapper/schedule/BaseConfigDataMapper.xml rename to src/main/resources/mapper/schedule/BaseConfigMapper.xml index b614e4d..9ab5c8c 100644 --- a/src/main/resources/mapper/schedule/BaseConfigDataMapper.xml +++ b/src/main/resources/mapper/schedule/BaseConfigMapper.xml @@ -1,6 +1,6 @@ - + @@ -20,28 +20,43 @@ select tbl.id,tbl.site,tbl.type,tbl.second_type,tbl.base_data,tbl.base_desc,tbl.status,tbl.sort_no,tbl.remark from tbl_base_data tbl - + and tbl.site=#{site,jdbcType=VARCHAR} - + and tbl.type = #{type,jdbcType=VARCHAR} - + and tbl.second_type = #{secondType} - select tbl.id,tbl.site,tbl.type,tbl.second_type,tbl.base_data,tbl.base_desc,tbl.status,tbl.sort_no,tbl.remark from tbl_base_data tbl - + and tbl.site=#{site,jdbcType=VARCHAR} AND tbl.type = #{type,jdbcType=VARCHAR} - + + AND tbl.second_type = #{secondType} + + + + + +