From efa93153a5ce87a268c4cc3a0f62e4a9b13a3500 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 25 Dec 2024 17:44:55 +0800 Subject: [PATCH] =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesBomService.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 5fc9c88..5db3630 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 @@ -91,19 +91,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); - 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); - } + + + + 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);