From a774301a9ad7244f801ebc33bc343fce2d2fc508 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 26 Dec 2024 12:24:08 +0800 Subject: [PATCH] =?UTF-8?q?44576=20BTO=E5=B7=A5=E5=8D=95=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=2044510=20bom=E5=A4=B1=E6=95=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesBomService.java | 10 ++++++++-- .../mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index 844e7ca..af45a30 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/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 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 bomList = baseRDao.findByHqlWherePage(packBean, pager); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 622daf9..cd015df 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/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 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 implements } } mesWorkOrderBoardResModels = mesWorkOrderBoardResModels.stream().filter(mesWorkOrderBoardResModel -> mesWorkOrderBoardResModel.getQty() > mesWorkOrderBoardResModel.getCompleteQty()).collect(Collectors.toList()); - + mesWorkOrderBoardResModels = mesWorkOrderBoardResModels.subList(0, 16); return mesWorkOrderBoardResModels; }