From 2ba89b2cdf3787996cb8d94c26825909e1cffce3 Mon Sep 17 00:00:00 2001 From: gsz Date: Sun, 9 Jun 2024 17:47:38 +0800 Subject: [PATCH] =?UTF-8?q?41238=20=E7=89=A9=E6=96=99bom=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java | 4 +++- .../mes/apiservice/controller/base/MesBomController.java | 5 +++-- .../mes/apiservice/serviceimpl/base/MesBomService.java | 15 +++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java index a4911a6..d13d438 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.ext.mes.api.base; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.mes.bean.MesBom; import io.swagger.annotations.ApiOperation; @@ -28,7 +30,7 @@ public interface IMesBomService extends IBaseMesService { * @return 组织模型数据返回树结构 */ @ApiOperation(value = "查询BOM树结构") - List queryMesDataTree(MesBom bom); + ListPager queryMesDataTree(MesBom bom, Pager pager); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java index bda2aa1..e5ea5dc 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.api.base.IMesBomService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesBom; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -40,11 +41,11 @@ public class MesBomController extends BaseMesController { @GetMapping(value = "/tree/query") @ApiOperation(value = "查询MES组织模型数据返回树结构-获取所有") - public ResultBean queryMesDataTree(MesBom bom) { + public ResultBean queryMesDataTree(MesBom bom, Pager pager) { try { bom.setOrganizeCode(AuthUtil.getOrganizeCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(bomService.queryMesDataTree(bom)); + .setListPager(bomService.queryMesDataTree(bom,pager)); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { 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 0f67529..f29f5b2 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 @@ -4,6 +4,9 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesBomService; import cn.estsh.i3plus.ext.mes.pojo.model.MesBomTreeModel; import cn.estsh.i3plus.platform.common.util.MesConstWords; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesBom; @@ -54,7 +57,7 @@ public class MesBomService extends BaseMesService implements IMesBomServ * @return */ @Override - public List queryMesDataTree(MesBom bom) { + public ListPager queryMesDataTree(MesBom bom, Pager pager) { List resultList = new ArrayList(); ValidatorBean.checkNotNull(bom.getPartNo(), "零件号不能为空"); MesBomTreeModel organize = new MesBomTreeModel(); @@ -63,14 +66,18 @@ public class MesBomService extends BaseMesService implements IMesBomServ // organize.setName("LML"); organize.setName(AuthUtil.getOrganize().getName()); - List bomList = baseRDao.findByProperty(new String[]{MesConstWords.IS_VALID, MesConstWords.IS_DELETED, MesConstWords.ORGANIZE_CODE, "partNo"}, - new Object[]{CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue(), bom.getOrganizeCode(), bom.getPartNo()}); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); + packBean.setOrderByStr(bom.getOrderByParam()) ; + pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean)); + + List bomList = baseRDao.findByHqlWherePage(packBean, pager); recursionBomList(bomList); organize.setChildTreeList(bomList); resultList.add(organize); - return resultList; + return new ListPager<>(resultList, pager); } /**