Merge remote-tracking branch 'origin/dev' into dev

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

@@ -363,6 +363,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", ddlPackBean);
         DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), "effStartTime", ddlPackBean);
+        DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), "effEndTime", ddlPackBean);
         DdlPreparedPack.getOrderBy("effStartTime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean);
         List<MesBom> mesBoms = mesBomRDao.findByHqlWhere(ddlPackBean);
         if (org.springframework.util.CollectionUtils.isEmpty(mesBoms)) {