From 6d5faf79cd73bdb89f7c62c52760bf6512bad632 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 24 Dec 2024 18:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=94=B5=E5=AD=90=E5=8C=96?=
 =?UTF-8?q?=E5=88=9D=E6=A3=80=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=92=8C=E5=8D=95=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesInputDefectRecordService.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 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 5345723..bb96e2a 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
@@ -474,10 +474,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                 if (model.getOptType() != 2) {
                     //移库
                     //移库
-                    String destLocateNo = getDestLocateNo(model, org);
                     String dest = configService.getCfgValue(org, "UMLGO");
-                    if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
-                        return;
+                    if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
+                        String destLocateNo = getDestLocateNo(model, org);
+                        if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
+                            return;
+                        }
                     }
                     MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                     moveRepository.save(move);
@@ -566,10 +568,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                         srcLocateNo = version.getReceiveInventoryPoint();
                     }
                     //移库
-                    String destLocateNo = getDestLocateNo(model, org);
                     String dest = configService.getCfgValue(org, "UMLGO");
-                    if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
-                        return;
+                    if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
+                        String destLocateNo = getDestLocateNo(model, org);
+                        if (!StringUtils.isEmpty(destLocateNo) && Objects.equals(dest, destLocateNo)) {
+                            return;
+                        }
                     }
                     MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                     moveRepository.save(move);