From 7343c0e462c7d2cd730e856ee9e4184904bd2209 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 8 Oct 2024 18:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=8F=AF=E7=96=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/MesInputDefectRecordService.java            | 20 +++++++++++++++++++-
 .../serviceimpl/busi/MesNcProcessingService.java     | 11 ++++++++++-
 2 files changed, 29 insertions(+), 2 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 1ebd00d..d364dba 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
@@ -369,6 +369,14 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                 }
                 if (Objects.isNull(srcLocateNo)) {
                     srcLocateNo = configService.getCfgValue(org, "LGORT");
+
+                    DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+                    DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", ddlPackBean);
+
+                    MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+                    if (version != null) {
+                        srcLocateNo = version.getShipInventoryPoint();
+                    }
                 }
                 if (model.getOptType() != 2) {
                     //移库
@@ -425,7 +433,17 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
 
                 //移库
                 if (model.getOptType() != 2) {
-                    MesMove move = createMove(model, configService.getCfgValue(org, "LGORT"), configService.getCfgValue(org, "UMLGO"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
+                   String srcLocateNo = configService.getCfgValue(org, "LGORT");
+
+                    DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+                    DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", ddlPackBean);
+
+                    MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+                    if (version != null) {
+                        srcLocateNo = version.getShipInventoryPoint();
+                    }
+
+                    MesMove move = createMove(model, srcLocateNo, configService.getCfgValue(org, "UMLGO"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
                     moveRepository.save(move);
                 }
 
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 1ea2a41..a4b4fe8 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
@@ -370,8 +370,17 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
             partInspectionRepository.save(model.getPartInspection());
 
+            String target = configService.getCfgValue(org, "LGORT");
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+            DdlPreparedPack.getStringEqualPack(model.getPart().getPartNo(), "partNo", ddlPackBean);
+
+            MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+            if (version != null) {
+                target = version.getShipInventoryPoint();
+            }
+
             //移库 转正常、放行：8000移至2000
-            MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "LGORT"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
+            MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
             ConvertBean.serviceModelInitialize(move,model.getUserName());
             moveRepository.save(move);