From a0a70736242f2e3f3921e7e4eb55f312009a85c3 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Thu, 20 Feb 2025 09:16:46 +0800
Subject: [PATCH] =?UTF-8?q?45119=20PCN-=E8=8A=9C=E6=B9=96=E5=AE=A2?=
 =?UTF-8?q?=E9=80=80=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E5=88=9D=E6=A3=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/MesInputDefectRecordService.java          | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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 67aa103..d1c2cee 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
@@ -264,6 +264,28 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                 partInspection = partInspectionRepository.save(partInspection);
 
                 if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
+                    //已创建返修单
+                    DdlPackBean reworkPackBean = DdlPackBean.getDdlPackBean(org);
+                    DdlPreparedPack.getStringEqualPack(model.getSn(), "sn", reworkPackBean);
+                    DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue(), "status", reworkPackBean);
+
+                    DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, reworkPackBean);
+                    int count = reworkTaskRepository.findByHqlWhereCount(reworkPackBean);
+                    if (count > 0) {
+                        // 如果是批次还需要移库
+                        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(org);
+                        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", ddlPackBean);
+                        MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+                        String srcNo = configService.getCfgValue(org, "LGORT");
+                        if (version != null) {
+                            srcNo = version.getReceiveInventoryPoint();
+                        }
+                        String destLocateNo = getDestLocateNo(model, org);
+                        if(!model.isTransferFlg() && !Objects.equals(srcNo, destLocateNo)) {
+                            throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
+                        }
+                    }
+
                     checkProduceSn(produceSn, model.getSn());
                     produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
                     ConvertBean.serviceModelInitialize(produceSn, AuthUtil.getSessionUser().getUserName());