44576 BTO工单看板查询

44510 bom失效查询问题

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

@@ -89,14 +89,20 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         MesBomTreeModel organize = new MesBomTreeModel();
 
         organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
-        organize.setName(AuthUtil.getOrganize().getName());
+        // organize.setName(AuthUtil.getOrganize().getName());
-
+        organize.setName("zxw");
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
         DdlPreparedPack.getStringEqualPack(bom.getBomCode(), "bomCode", packBean);
         DdlPreparedPack.getStringSmallerPack(bom.getEffStartTime(), "effStartTime", packBean);
+
+
+
+        String sql = " and (model.effEndTime = '' or model.effEndTime is null or model.effEndTime >= '" + bom.getEffStartTime()  + "' )" ;
+        packBean.setWhereAppend(packBean.getWhereAppend() +  sql);
         packBean.setOrderByStr(" order by createDatetime desc ");
+
         pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
 
         List<MesBom> bomList = baseRDao.findByHqlWherePage(packBean, pager);

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

@@ -2067,7 +2067,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);
@@ -2158,7 +2158,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;
     }