Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java

@@ -173,18 +173,11 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_START_TIME, ddlPackBean);
         if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_END_TIME, ddlPackBean);
         DdlPreparedPack.getOrderBy(MesExtConstWords.EFF_START_TIME, CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean);
-        List<MesBom> mesBoms = baseRDao.findByHqlTopWhere(ddlPackBean,1);
+        List<MesBom> mesBoms = baseRDao.findByHqlWhere(ddlPackBean);
         if (CollectionUtils.isEmpty(mesBoms)) {
             MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", partNo, bomVersion);
         }
-        MesBom mesBom = mesBoms.get(0);
-        String bomCode = mesBom.getBomCode();
-        String effStartTime = mesBom.getEffStartTime();
-        DdlPackBean ddlPackBean1= DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, ddlPackBean1);
-        DdlPreparedPack.getStringEqualPack(bomCode, MesExtConstWords.BOM_CODE, ddlPackBean1);
-        DdlPreparedPack.getStringSmallerPack(effStartTime, MesExtConstWords.EFF_START_TIME, ddlPackBean1);
-        return baseRDao.findByHqlWhere(ddlPackBean1);
+        return mesBoms;
     }
 
     @Override