From 8245fb211204ef392880e73052d48db1e1774962 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Thu, 19 Jun 2025 17:44:51 +0800
Subject: [PATCH] =?UTF-8?q?nc=E5=A4=84=E7=90=86=E6=9B=B4=E6=96=B0=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E5=8D=95=E7=9A=84=E8=B4=A3=E4=BB=BB=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesNcProcessingService.java           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 2b993d3..fd141be 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
@@ -732,8 +732,8 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
             if (type == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue()) {
 
-                model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
-                model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue());
+                mesPartInspection.setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
+                mesPartInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue());
                 ConvertBean.serviceModelUpdate(model.getPartInspection(), model.getUserName());
                 String sourceValue = configService.getCfgValue(org, "UMLGO");
 
@@ -789,7 +789,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                 DdlPreparedPack.getStringLikerPack(mesNcPersonModel.getOnlyPerson(), "responsibleParty", partyPackBean);
                 MesOrg mesOrg = mesOrgRDao.getByProperty(partyPackBean);
 
-                mesPartInspectionPerson.setResponsibleParty(mesOrg.getResponsibleParty());
+                mesPartInspectionPerson.setResponsibleParty(mesNcPersonModel.getOnlyPerson());
                 ConvertBean.serviceModelInitialize(mesPartInspectionPerson, model.getUserName());
                 personList.add(mesPartInspectionPerson);
 
@@ -826,8 +826,8 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                 reworkTaskDetailRepository.saveAll(taskDetailList);
 
                 //model.getPartInspection().setDefectTypeId(person.getId());
-                model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.REWORK.getValue());
-                model.getPartInspection().setReworkTaskId(reworkTask.getId());
+                mesPartInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.REWORK.getValue());
+                mesPartInspection.setReworkTaskId(reworkTask.getId());
                 ConvertBean.serviceModelUpdate(model.getPartInspection(),model.getUserName());
                 String sourceValue = configService.getCfgValue(org, "UMLGO");
 
@@ -843,7 +843,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
             } else if (type == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue()) {
                 //报废时设置责任人
-                model.getPartInspection().setResponsibleParty(mesNcPersonModel.getOnlyPerson());
+                mesPartInspection.setResponsibleParty(mesNcPersonModel.getOnlyPerson());
                 //model.getPartInspection().setDefectTypeId(person.getId());
                 model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
                 model.getPartInspection().setRejectQty(model.getPartInspection().getQty());
@@ -868,7 +868,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                 if (mesOrg ==null) {
                     throw new ImppBusiException(String.format("责任人【%s】不存在", mesNcPersonModel.getOnlyPerson()));
                 }
-                mesPartInspectionPerson.setResponsibleParty(mesOrg.getResponsibleParty());
+                mesPartInspectionPerson.setResponsibleParty(mesNcPersonModel.getOnlyPerson());
                 ConvertBean.serviceModelInitialize(mesPartInspectionPerson, model.getUserName());
                 personList.add(mesPartInspectionPerson);