From 5e233d6d65efa63a15a9b2f6a2bfdc8e8f28ec39 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Tue, 7 Jan 2025 19:40:20 +0800 Subject: [PATCH] =?UTF-8?q?44728:=20=E5=8C=85=E8=A3=85=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=8F=9C=E5=8D=95=E9=9C=80=E8=A6=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesPackingDefineDetailsServiceImpl.java | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java index bf43d1b..11e33a6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingDefineDetailsServiceImpl.java @@ -2,13 +2,22 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesPackingDefineDetailsService; import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails; +import cn.estsh.i3plus.pojo.base.util.StringUtil; +import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +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 java.util.List; + /** * @Description : 包装定义维护明细 * @Reference : @@ -20,6 +29,9 @@ import org.springframework.stereotype.Service; @Slf4j public class MesPackingDefineDetailsServiceImpl extends BaseMesService implements IMesPackingDefineDetailsService { + @Autowired + private MesPartRepository mesPartRepository; + @Override protected void setPackQueryBean(MesPackingDefineDetails bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getPackCode(), "packCode", packBean); @@ -59,4 +71,35 @@ public class MesPackingDefineDetailsServiceImpl extends BaseMesService validateReturnImport(List beanList) { + + for (MesPackingDefineDetails item : beanList) { + + + String organizeCode = AuthUtil.getOrganizeCode(); + // 数据校验 + ValidatorBean.checkNotNull(item.getPackCode(), "箱类别代号不能为空"); + ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); + + DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringLikerPack(item.getPartNo(), "partNo", partQueryPackBean); + MesPart mesPart = mesPartRepository.getByProperty(partQueryPackBean); + + if (mesPart == null) { + MesException.throwMesBusiException("物料号【%s】不存在，请检查数据",item.getPartNo()); + } + item.setPartName(mesPart.getPartName()); + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPackCode(), "packCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", roadPackBean); + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + MesException.throwMesBusiException("箱类别代号【%s】物料号【%s】已经存在，请检查数据", item.getPackCode(),item.getPartNo()); + } + + } + return beanList; + } }