From 64b9c12fa2a4b74e91aff427d60768757c0de369 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Thu, 10 Apr 2025 13:54:52 +0800
Subject: [PATCH] =?UTF-8?q?46256=20PCN=EF=BC=9A=E8=BF=94=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA0=EF=BC=8C=E4=BA=A7=E7=BA=BF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java   | 2 ++
 .../pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
index 0ac189f..7d7a0c8 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
@@ -292,6 +292,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
     public void doReworkSuccess(MesReworkTaskRequestModel requestModel) {
 
         MesReworkTask mesReworkTask = getMesReworkTask(requestModel);
+
         /**
          * 获取返工单信息
          */
@@ -364,6 +365,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             if (mesPartInspection != null) {
                 workCenterCode = mesPartInspection.getWorkCenterCode();
             }
+            requestModel.setReworkedQty(mesReworkTask.getQty());
             if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
                 if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
                     String destLocateNo = getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId());
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 665dd30..00a6f07 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
@@ -238,6 +238,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
     public void savePartInspection(MesPartInspectionInputModel model) {
 
         MesProduceSn produceSn = getProduceSn(model.getSn(), model.getOrganizeCode());
+        model.setWorkCenterCode(produceSn.getWorkCenterCode());
         if (null != produceSn && StringUtils.isEmpty(model.getPartNo())) model.setPartNo(produceSn.getPartNo());
         //武汉 会输入客户条码
         boolean isWorkOrderQcStatus=false;