From bb2a3f1092082bc2cd7c7a0a3b8a6230457ac0ab Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 13 Sep 2024 16:46:25 +0800 Subject: [PATCH] =?UTF-8?q?43010=20PNC=E5=A2=9E=E5=8A=A0=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/api/busi/IMesProduceSnPrintService.java | 6 ++++++ .../controller/busi/MesProduceSnPrintController.java | 17 +++++++++++++++++ .../serviceimpl/busi/MesProduceSnPrintService.java | 19 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java index 1ce8025..c0967f4 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java @@ -2,8 +2,11 @@ package cn.estsh.i3plus.ext.mes.pcn.api.busi; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly; import io.swagger.annotations.ApiOperation; +import java.util.List; + public interface IMesProduceSnPrintService { @ApiOperation(value = "查询包装信息") @@ -14,4 +17,7 @@ public interface IMesProduceSnPrintService { @ApiOperation(value = "打印") MesProduceSnPrintModel doPrint(MesProduceSnPrintModel mesProduceSnPrintModel); + + @ApiOperation(value = "装配件查询") + List findMesProductionAssembly(MesProductionAssembly mesProductionAssembly); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java index 3b6e679..ed0ac1f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnPrintService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; +import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -97,4 +98,20 @@ public class MesProduceSnPrintController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + @GetMapping("/mes-production-assembly/find") + @ApiOperation(value = "装配件查询") + public ResultBean findMesProductionAssembly(MesProductionAssembly mesProductionAssembly) { + try { + ValidatorBean.checkNotNull(mesProductionAssembly.getAssemblySn(), "装配件条码条码不能为空"); + ValidatorBean.checkNotNull(mesProductionAssembly.getOrganizeCode(), "工厂代码不能为空"); + return ResultBean.success("查询成功") + .setMsg(String.format("装配件【%s】条码查询成功!!!", mesProductionAssembly.getAssemblySn())) + .setResultList(mesProduceSnPrintService.findMesProductionAssembly(mesProductionAssembly)); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java index 05764d7..bbf41be 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java @@ -68,6 +68,8 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService { @Autowired private MesCustomerPartRepository mesCustomerPartRDao; + @Autowired + private MesProductionAssemblyRepository mesProductionAssemblyRepository; @Autowired private IConfigService configService; @@ -216,4 +218,21 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService { MesCustomerPart mesCustomerPart = mesCustomerPartRDao.getByProperty(ddlPackBean); return mesCustomerPart; } + + @Override + public List findMesProductionAssembly(MesProductionAssembly requestModel) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(requestModel.getAssemblySn(), "assemblySn", packBean); + if (!StringUtils.isEmpty(requestModel.getPartNo())) { + DdlPreparedPack.getStringEqualPack(requestModel.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(requestModel.getAssemblyPartNo())) { + DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean); + } + List mesProductionAssemblies = mesProductionAssemblyRepository.findByHqlWhere(packBean); + if (CollectionUtils.isEmpty(mesProductionAssemblies)) { + MesPcnException.throwMesBusiException("扫描的装配件条码【%s】条码不存在，请扫描其他的装配件！！！",requestModel.getAssemblySn()); + } + return mesProductionAssemblies; + } }