From 33d3ec2f6651c7c849cfcb763b0545a6a94ca6cd 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: Thu, 30 May 2024 20:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E9=9C=80=E6=B1=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesReworkTaskServiceImpl.java | 27 +++++++++++-----------
 .../pcn/pojo/model/MesReworkTaskRequestModel.java  |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

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 6dc4f28..3d589a3 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
@@ -110,11 +110,14 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
          * 获取缺陷记录
          */
         MesPartInspection mesPartInspection = getMesPartInspection(res);
-        /**
-         * 获取零件缺陷明细列表
-         */
-        List<MesPartInspectionDetail> mesPartInspectionDetails = getMesPartInspectionDetail(reworkTaskDetails);
 
+        List<MesPartInspectionDetail> mesPartInspectionDetails = null;
+        if (!CollectionUtils.isEmpty(reworkTaskDetails)) {
+            /**
+             * 获取零件缺陷明细列表
+             */
+            mesPartInspectionDetails = getMesPartInspectionDetail(reworkTaskDetails);
+        }
         /**
          * 组装返回信息
          */
@@ -186,7 +189,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
 
         try {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", packBean);
+            DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "productSn", packBean);
             MesProduceSn mesProduceSn = mesProduceSnRepository.getByProperty(packBean);
             if (mesProduceSn == null) {
                 MesPcnException.throwFlowException("条码信息不存在");
@@ -211,12 +214,12 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             mesProductionAssembly.setRepeatAssemblySn(requestModel.getSn());
             mesProductionAssemblyRepository.update(mesProductionAssembly);
 
-            mesProductionAssemblyRepository.insert(mesProductionRepeatAssembly);
+            mesProductionAssemblyRepository.save(mesProductionRepeatAssembly);
             /**
              * 需要更新NC标记后进入的表明细状态为已处理
              */
-            for (Long detailId : requestModel.getDetailIds()) {
-                reworkRecord(detailId);
+            for (String detailId : requestModel.getDetailIds().split(",")) {
+                reworkRecord(Long.valueOf(detailId));
             }
         } catch (Exception e) {
             log.error("替换条码异常", e);
@@ -230,9 +233,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         DdlPreparedPack.getStringEqualPack(mesReworkTask.getSn(), "sn", packBean);
 
         MesPartInspection mesPartInspection = mesPartInspectionRepository.getByProperty(packBean);
-        if (mesPartInspection == null) {
-            throw new ImppBusiException("返工单信息不存在");
-        }
+
         return mesPartInspection;
     }
 
@@ -280,9 +281,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_DETAIL_STATUS.REWORK_TASK_DETAIL_STATUS_10.getValue(), "status", packBean);
 
         List<MesReworkTaskDetail> res = mesReworkTaskDetailRepository.findByHqlWhere(packBean);
-        if (CollectionUtils.isEmpty(res)) {
-            throw new ImppBusiException("返工单详情信息不存在");
-        }
+
         return res;
     }
 }
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java
index 067c247..8860716 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java
@@ -39,6 +39,6 @@ public class MesReworkTaskRequestModel {
 
     private Integer assemblyPartStatus;
 
-    private List<Long> detailIds;
+    private String detailIds;
 
 }