Merge branch 'dev-temp-workorder-report-wj-202412190000-00000' into dev

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesConfigService.java

@@ -39,4 +39,7 @@ public interface IMesConfigService {
     @ApiOperation(value = "获取配置信息")
     List<MesConfig> findMesConfigList(String organizeCode, String cfgCode);
 
+    @ApiOperation(value = "获取配置信息")
+    MesConfig getCfgValueByCode(String organizeCode, String cfgCode);
+
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesConfigService.java

@@ -113,5 +113,13 @@ public class MesConfigService implements IMesConfigService {
         return configList;
     }
 
+    @Override
+    public MesConfig getCfgValueByCode(String organizeCode,String cfgCode) {
+        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(cfgCode)) return null;
+        return configRepository.getByProperty(
+                new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.CFG_CODE},
+                new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), cfgCode});
+    }
+
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -359,12 +359,18 @@ public class MesWorkOrderService implements IMesWorkOrderService {
     }
 
     public List<MesBom> findMesBomByPartNoAndBomVersion(String partNo, String organizeCode, String bomVersion) {
+
+        //MES汇报查询BOM是否携带结束查询条件
+        MesConfig config = configService.getCfgValueByCode(organizeCode, MesPcnExtConstWords.MES_REPORT_FIND_BOM_WITH_EFFENDTIME);
+        Boolean isWithEffEndTime = (null != config && !StringUtils.isEmpty(config.getCfgValue()) && config.getCfgValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) ? true : false;
+
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(partNo, MesPcnExtConstWords.PART_NO, ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bomVersion, MesPcnExtConstWords.BOM_VERSION, ddlPackBean);
-        DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), "effStartTime", ddlPackBean);
+        DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), MesPcnExtConstWords.EFF_START_TIME, ddlPackBean);
-        DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), "effEndTime", ddlPackBean);
+        if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), MesPcnExtConstWords.EFF_END_TIME, ddlPackBean);
-        DdlPreparedPack.getOrderBy("effStartTime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean);
+        DdlPreparedPack.getOrderBy(MesPcnExtConstWords.EFF_START_TIME, CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean);
+
         List<MesBom> mesBoms = mesBomRDao.findByHqlWhere(ddlPackBean);
         if (org.springframework.util.CollectionUtils.isEmpty(mesBoms)) {
             LOGGER.info("物料{}生产版本{}对应bom信息不存在", partNo, bomVersion );

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -298,6 +298,15 @@ public class MesPcnExtConstWords {
     public static final String REPORT_STATUS = "reportStatus";
     //汇报状态
     public static final String REPORT_STATUS_NAME = "reportStatusName";
+    //BOM版本
+    public static final String BOM_VERSION = "bomVersion";
+    //生效时间
+    public static final String EFF_START_TIME = "effStartTime";
+    //失效时间
+    public static final String EFF_END_TIME = "effEndTime";
+    //MES汇报查询BOM是否携带结束查询条件
+    public static final String MES_REPORT_FIND_BOM_WITH_EFFENDTIME = "MES_REPORT_FIND_BOM_WITH_EFFENDTIME";
+
 
 
     //BaseBean字段不包含工厂, 用于对象复制剔除属性BeanUtils.copyProperties(Object source, Object target, String... ignoreProperties)