BTO工单完成数量报表修改和bom失效时间修改

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

@@ -40,6 +40,8 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
     @Autowired
     private IMesConfigService mesConfigService;
 
+    private final String MES_REPORT_FIND_BOM_WITH_EFFENDTIME = "MES_REPORT_FIND_BOM_WITH_EFFENDTIME";
+
     protected void setPackQueryBean(MesBom bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getBomVersion(), "bomVersion", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
@@ -96,6 +98,11 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
         DdlPreparedPack.getStringEqualPack(bom.getBomCode(), "bomCode", packBean);
         DdlPreparedPack.getStringSmallerPack(bom.getEffStartTime(), "effStartTime", packBean);
+        MesConfig config = mesConfigService.getCfgValueByCode(bom.getOrganizeCode(), 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;
+        if (isWithEffEndTime) {
+            DdlPreparedPack.getStringBiggerPack(bom.getEffStartTime(), "effEndTime", packBean);
+        }
         packBean.setOrderByStr(" order by createDatetime desc ");
         pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
 

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

@@ -2093,7 +2093,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             sqlStr += " and mwo.work_center_code = :workCenterCode  ";
         }
 
-        sqlStr += "order by mwo.create_date_time limit 16";
+        sqlStr += "order by mwo.create_date_time ";
 
         String dateTime =  new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 30)) + " 00:00:00";
         Query query = entityManager.createNativeQuery(sqlStr);
@@ -2184,7 +2184,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             }
         }
         mesWorkOrderBoardResModels = mesWorkOrderBoardResModels.stream().filter(mesWorkOrderBoardResModel -> mesWorkOrderBoardResModel.getQty() > mesWorkOrderBoardResModel.getCompleteQty()).collect(Collectors.toList());
-
+        mesWorkOrderBoardResModels = mesWorkOrderBoardResModels.subList(0, 16);
 
         return mesWorkOrderBoardResModels;
     }