解决冲突

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

@@ -149,6 +149,9 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", ddlPackBean);
+        DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), MesExtConstWords.EFF_START_TIME, ddlPackBean);
+        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.findByHqlWhere(ddlPackBean);
         if (CollectionUtils.isEmpty(mesBoms)) {
             MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", partNo, bomVersion);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/MesException.java

@@ -48,7 +48,7 @@ public class MesException {
      * @param errorDetail 错误详情
      * @param errorSoluction 解决办法
      */
-    public static void throwBusiException(String errorCode,String errorDetail,String errorSoluction,Object...args){
+    public static void throwBusiExceptionByCode(String errorCode,String errorDetail,String errorSoluction,Object...args){
         throw ImppExceptionBuilder.newInstance()
                 .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                 .setErrorCode(errorCode)