From a89b46843d601da51647b23856a2dc13db27154e Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 6 Jun 2024 16:33:39 +0800 Subject: [PATCH] =?UTF-8?q?41153=20MES:PCN-NC=E5=A4=84=E7=90=86=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=9D=A1=E7=A0=81=E5=90=8E=EF=BC=8C=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=BD=AC=E6=AD=A3=E5=B8=B8=EF=BC=8C=E6=8A=A5=E9=94=99=EF=BC=9A?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesNcProcessingService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index 56a03dd..1b203f4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -15,6 +15,7 @@ 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.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection; import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail; @@ -162,14 +163,14 @@ public class MesNcProcessingService implements IMesNcProcessingService { if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) { Integer type = model.getType(); - MesDefectType person = model.getPerson(); + MesDefectType person = StringUtil.isEmpty(model.getPerson())?new MesDefectType():model.getPerson(); //保存数据 saveDate(model, model.getPart(), type, person, org,model.getAreaCode()); } else { Integer type = model.getType(); - MesDefectType person = model.getPerson(); + MesDefectType person = StringUtil.isEmpty(model.getPerson())?new MesDefectType():model.getPerson(); //保存数据 saveDate(model, model.getPart(), type, person, org,model.getAreaCode()); @@ -331,7 +332,9 @@ public class MesNcProcessingService implements IMesNcProcessingService { produceSnRepository.save(sn); //更新检验单 - model.getPartInspection().setDefectTypeId(person.getId()); + if (model.getType() != 10 && model.getType() != 40) { + model.getPartInspection().setDefectTypeId(person.getId()); + } model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue()); model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue()); ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName()); @@ -419,7 +422,9 @@ public class MesNcProcessingService implements IMesNcProcessingService { produceSnRepository.save(sn); //更新检验单 - model.getPartInspection().setDefectTypeId(person.getId()); + if (model.getType() != 10 && model.getType() != 40) { + model.getPartInspection().setDefectTypeId(person.getId()); + } model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue()); model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.RELEASE.getValue()); ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName());