From 6ff07cd721e86a866ff34f904cb518f546952c7b Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Mon, 13 Jan 2025 19:10:29 +0800 Subject: [PATCH] =?UTF-8?q?44813=20PC:=20=E7=BC=BA=E9=99=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8E=E9=9B=B6=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E5=AF=BC=E5=85=A5=E5=90=8E=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=92=8C=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesPartTypeDefectService.java | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java index 53f151c..df4bd47 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java @@ -5,10 +5,16 @@ 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.MesDefectType; +import cn.estsh.i3plus.pojo.mes.bean.MesPartType; import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect; +import cn.estsh.i3plus.pojo.mes.repository.MesDefectTypeRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesPartTypeRepository; 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; @@ -17,6 +23,11 @@ import java.util.List; @Slf4j public class MesPartTypeDefectService extends BaseMesService implements IBaseMesService { + @Autowired + private MesPartTypeRepository partTypeRepository; + + @Autowired + private MesDefectTypeRepository defectTypeRepository; @Override protected void setPackQueryBean(MesPartTypeDefect bean, DdlPackBean packBean) { @@ -87,4 +98,52 @@ public class MesPartTypeDefectService extends BaseMesService } } } + + @Override + public List validateReturnImport(List beanList) { + + for (MesPartTypeDefect item : beanList) { + // 数据校验 + ValidatorBean.checkNotNull(item.getDefectTypeCode(), "缺陷类型不能为空"); + ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型不能为空"); + + DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", roadPackBean); + + boolean flg = baseRDao.isExitByHql(roadPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("缺陷类型【%s】零件类型【%s】已经存在，请检查数据", item.getDefectTypeCode(), item.getPartTypeCode()) + .build(); + } + + DdlPackBean partTypePackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", partTypePackBean); + MesPartType partType = partTypeRepository.getByProperty(partTypePackBean); + if (partType == null) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("零件类型【%s】不存在，请检查数据", item.getPartTypeCode()) + .build(); + } + item.setPartTypeName(partType.getPartTypeName()); + + DdlPackBean defectTypePackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "defectTypeCode", defectTypePackBean); + MesDefectType defectType = defectTypeRepository.getByProperty(defectTypePackBean); + if (defectTypeRepository == null) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("缺陷类型【%s】不存在，请检查数据", item.getPartTypeCode()) + .build(); + } + item.setDefectTypeName(defectType.getDefectTypeName()); + } + return beanList; + } }