From b1adbaad4980fbfdcbc9ec801c2a1d242f61708f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Wed, 14 Aug 2024 18:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=BF=BD=E7=95=A5=E8=AF=95?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesInputDefectRecordService.java         | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
index 1b2ad59..8b51643 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
@@ -13,7 +13,6 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
@@ -354,6 +353,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
 
                 model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.FAIL.getValue());
                 ConvertBean.serviceModelUpdate(model.getPartInspection(), AuthUtil.getSessionUser().getUserName());
+                partInspectionRepository.save(model.getPartInspection());
 
                 //查询当前单据明细
                 List<MesPartInspectionDetail> resultDetailList = queryResultDetailList(model, org);
@@ -387,19 +387,10 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                 if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
                     checkProduceSn(produceSn, model.getSn());
                     produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS.getValue());
-                    String defectTypeCode = MesEnumUtil.DEFECT_TYPE_CODE.DETERMIND.getValue();
-                    //根据页面上选择的位置 查询位置，若不存在则提示 位置不存在，请检查数据
-                    DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
-                    DdlPreparedPack.getStringEqualPack("QX130", "defectTypeCode", packBean);
-                    MesDefectType defectType = defectTypeRepository.getByProperty(packBean);
-
-                    model.getPartInspection().setDefectTypeCode(defectType.getDefectTypeCode());
-                    model.getPartInspection().setDefectTypeId(defectType.getId());
                     ConvertBean.serviceModelInitialize(produceSn, AuthUtil.getSessionUser().getUserName());
                     produceSnExtService.update(produceSn);
                 }
 
-                partInspectionRepository.save(model.getPartInspection());
                 partInspectionDetailRepository.saveAll(resultDetailList);
                 partInspectionDetailRepository.saveAll(model.getPartInspectionDetailList());