From 3e5a3ac66fe48920a0ee552471a42076dcb72ccc Mon Sep 17 00:00:00 2001 From: "logic.fang" <[logic.fang@estsh.com]> Date: Thu, 20 Jun 2024 19:52:50 +0800 Subject: [PATCH] =?UTF-8?q?41513=20MES-PC=E7=AB=AF-=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E3=80=81=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?-=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=90=8C=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E3=80=81=E5=90=AF=E5=8A=A8=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesPartService.java | 4 +++ .../mes/api/base/IMesProductVersionService.java | 3 +++ .../controller/base/MesPartController.java | 30 ++++++++++++++++++++- .../base/MesProductVersionController.java | 31 ++++++++++++++++++++++ .../serviceimpl/base/MesPartService.java | 20 +++++++++++++- .../serviceimpl/base/MesProductVersionService.java | 23 ++++++++++++++++ 6 files changed, 109 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java index 66fc186..49ef0f4 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.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.MesPart; import java.util.List; @@ -14,4 +16,6 @@ public interface IMesPartService extends IBaseMesService { MesPart getPartByPartNo(String partNo, String organizeCode); List findMesPartByPartNoList(List partNoList, String organizeCode); + + ListPager queryMesPartByPagerExt(MesPart mesPart, Pager pager); } diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductVersionService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductVersionService.java index f01e01e..72a837c 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductVersionService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductVersionService.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.MesProductVersion; /** @@ -9,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProductVersion; */ public interface IMesProductVersionService extends IBaseMesService { + ListPager queryMesProductVersionByPagerExt(MesProductVersion mesProductVersion, Pager pager); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java index 8fae6fa..a558fc3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java @@ -1,9 +1,18 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,4 +23,23 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPart") public class MesPartController extends BaseMesController{ + + @Autowired + private IMesPartService mesPartService; + + @ApiOperation(value = "查询物料信息", notes = "查询物料信息") + @GetMapping("/query-ext") + public ResultBean queryMesProdRuleByPager(MesPart mesPart, Pager pager){ + try { + String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); + mesPart.setOrganizeCode(organizeCode); + return ResultBean.success("查询物料信息成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()). + setListPager(mesPartService.queryMesPartByPagerExt(mesPart, pager)); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductVersionController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductVersionController.java index d37e189..8a23675 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductVersionController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductVersionController.java @@ -1,8 +1,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesProductVersionService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesProductVersion; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api("生产版本") @@ -10,4 +21,24 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesProductVersion") public class MesProductVersionController extends BaseMesController{ + + @Autowired + private IMesProductVersionService mesProductVersionService; + + @ApiOperation(value = "查询生产版本", notes = "查询生产版本") + @GetMapping("/query-ext") + public ResultBean queryMesProdRuleByPager(MesProductVersion mesProductVersion, Pager pager){ + try { + String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); + mesProductVersion.setOrganizeCode(organizeCode); + ListPager productVersionListPager = mesProductVersionService.queryMesProductVersionByPagerExt(mesProductVersion, pager); + return ResultBean.success("查询生产版本成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()). + setListPager(productVersionListPager); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java index 611f661..3a27ef3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java @@ -4,13 +4,17 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; 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.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesPartSap; +import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -20,6 +24,9 @@ import java.util.List; @Slf4j public class MesPartService extends BaseMesService implements IMesPartService { + @Autowired + private MesPartRepository mesPartRepository; + protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean); @@ -49,6 +56,17 @@ public class MesPartService extends BaseMesService implements IMesPartS return mesPartList; } + @Override + public ListPager queryMesPartByPagerExt(MesPart mesPart, Pager pager) { + DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(mesPart.getIsValid(), "isValid", partQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", partQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", partQueryPackBean); + pager = PagerHelper.getPager(pager, mesPartRepository.findByHqlWhereCount(partQueryPackBean)); + List mesPartList = mesPartRepository.findByHqlWherePage(partQueryPackBean, pager); + return new ListPager<>(mesPartList, pager); + } + protected void onInsertBean(MesPart item) { // 数据校验 ValidatorBean.checkNotNull(item.getPartNo(), "物料号不能为空"); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java index 7308ad8..26e518a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java @@ -2,15 +2,25 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesProductVersionService; 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.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesProductVersion; +import cn.estsh.i3plus.pojo.mes.repository.MesProductVersionRepository; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesProductVersionService extends BaseMesService implements IMesProductVersionService { + @Autowired + private MesProductVersionRepository mesProductVersionRepository; + @Override protected void setPackQueryBean(MesProductVersion bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getPartNo(),"partNo",packBean); @@ -21,4 +31,17 @@ public class MesProductVersionService extends BaseMesService DdlPreparedPack.getStringLikerPack(bean.getPartName(),"partName",packBean); } + @Override + public ListPager queryMesProductVersionByPagerExt(MesProductVersion mesProductVersion, Pager pager) { + DdlPackBean productVersionQueryPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(mesProductVersion.getIsValid(), "isValid", productVersionQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesProductVersion.getProductVersion(), "productVersion", productVersionQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesProductVersion.getPartNo(), "partNo", productVersionQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesProductVersion.getWorkCenterCode(), "workCenterCode", productVersionQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesProductVersion.getShipInventoryPoint(), "shipInventoryPoint", productVersionQueryPackBean); + DdlPreparedPack.getStringLikerPack(mesProductVersion.getReceiveInventoryPoint(), "receiveInventoryPoint", productVersionQueryPackBean); + pager = PagerHelper.getPager(pager, mesProductVersionRepository.findByHqlWhereCount(productVersionQueryPackBean)); + List mesProductVersions = mesProductVersionRepository.findByHqlWherePage(productVersionQueryPackBean, pager); + return new ListPager<>(mesProductVersions, pager); + } }