From c6451c8189db0812d8e3c94dcfacf307bd0e051d Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Wed, 28 Aug 2024 18:59:43 +0800
Subject: [PATCH] =?UTF-8?q?PBOM=E5=AD=90=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E3=80=90source=5Fparent=5Fmaterial=5Fno=E3=80=91=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java   | 4 ++++
 .../product/bomnew/service/BomNewPbomExportToSAPImpl.java     | 3 ++-
 .../nflg/product/bomnew/service/BomNewPbomParentService.java  | 4 ++++
 .../bomnew/service/domain/EBom/ChangeImpactUpgrade.java       | 2 +-
 .../nflg/product/bomnew/service/domain/EBom/EBomToPBom.java   | 2 +-
 .../product/bomnew/service/domain/EBom/EBomToPBomFor31.java   | 2 +-
 .../bomnew/service/domain/EBom/EBomToPBomForFormal.java       | 2 +-
 .../bomnew/service/domain/EBom/EBomToPBomForFormal31.java     | 2 +-
 .../product/bomnew/service/domain/EBom/EBomToPbomBase.java    | 2 +-
 9 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
index 8defbefd..d8b88bd0 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
@@ -299,6 +299,10 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable {
     @ApiModelProperty(value = "来源状态：1-EBOM导入、2-PBOM创建、3-E->P修改")
     private String sourceStatusName;
 
+    //PBOM发起变更时，漏掉该值 by luohj 240828
+    @ApiModelProperty("来源行-父项物料编码")
+    private String sourceParentMaterialNo;
+
     @ApiModelProperty("原始物料编码")
     private String originalMaterialNo;
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
index 81ba2b60..9600facb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
@@ -340,7 +340,8 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
                         , BomNewPbomChildEntity::getMaterialUnit, BomNewPbomChildEntity::getMaterialDesc
                         , BomNewPbomChildEntity::getVirtualPartType, BomNewPbomChildEntity::getProjectType
                         , BomNewPbomChildEntity::getFacCode, BomNewPbomChildEntity::getMaterialCategoryCode
-                        , BomNewPbomChildEntity::getRowId)
+                        , BomNewPbomChildEntity::getRowId
+                        ,BomNewPbomChildEntity::getSourceParentMaterialNo)
                 .eq(BomNewPbomChildEntity::getParentRowId, parent.getRowId())
                 .orderByAsc(BomNewPbomChildEntity::getOrderNumber)
                 .list();
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 5b3dca9e..13479ec2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -1303,6 +1303,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                     t1.setIDNRK("");
                     t1.setPOTX1(c.getMaterialDesc());
                 }
+                //项目类别为F项，则给POTX1 赋值来源EBOM的父级物料编码 by luohj 20240826
+                if(ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equalsIgnoreCase(c.getProjectType())){
+                    t1.setPOTX1(c.getSourceParentMaterialNo());
+                }
                 t1.setDATUM(dateYMD);
                 t1s.add(t1);
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
index 9e6171e3..23e4144d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
@@ -78,7 +78,7 @@ public class ChangeImpactUpgrade extends EBomToPbomBase {
                         childEnt.setFacCode(facCode);
                         childEnt.setIdentityNo(StrUtil.join("-", vParent.getMaterialNo(), eb.getMaterialNo()));
                         //原ebom父级编码 by luohj 240828
-                        childEnt.setSourceParentMaterialNo(vMaterial.get(0).getMaterialNo());
+                        childEnt.setSourceParentMaterialNo(eb.getSourceParentMaterialNo());
                         childEnt.setOriginalMaterialNo(eb.getMaterialNo());
                         childEnt.setOriginalProjectType(eb.getProjectType());
                         childEnt.setOriginalNum(eb.getNum());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index a32629e3..7ade0779 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -97,7 +97,7 @@ public class EBomToPBom extends EBomToPbomBase {
                         childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo()));
                         childEnt.setOriginalMaterialNo(eb.getMaterialNo());
                         //原ebom父级编码 by luohj 240828
-                        childEnt.setSourceParentMaterialNo(vo.getMaterialNo());
+                        childEnt.setSourceParentMaterialNo(eb.getSourceParentMaterialNo());
                         childEnt.setOriginalProjectType(eb.getProjectType());
                         childEnt.setOriginalNum(eb.getNum());
                         childEnt.setCreatedTime(LocalDateTime.now());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
index 00fe3237..3a50a222 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
@@ -137,7 +137,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
                         childEnt.setSource(PbomSourceEnum.FROM_EBOM.getValue());
                         childEnt.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue());
                         //原ebom父级编码 by luohj 240828
-                        childEnt.setSourceParentMaterialNo(vo.getMaterialNo());
+                        childEnt.setSourceParentMaterialNo(eb.getSourceParentMaterialNo());
                         childEnt.setOriginalMaterialNo(eb.getMaterialNo());
                         childEnt.setOriginalNum(eb.getNum());
                         childEnt.setOriginalProjectType(eb.getProjectType());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal.java
index c6830cb4..59856c51 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal.java
@@ -107,7 +107,7 @@ public class EBomToPBomForFormal extends EBomToPbomBase {
                         childEnt.setSourceRowId(eb.getRowId());
                         childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo()));
                         //原ebom父级编码 by luohj 240828
-                        childEnt.setSourceParentMaterialNo(vo.getMaterialNo());
+                        childEnt.setSourceParentMaterialNo(eb.getSourceParentMaterialNo());
                         childEnt.setOriginalMaterialNo(eb.getMaterialNo());
                         childEnt.setOriginalNum(eb.getNum());
                         childEnt.setOriginalProjectType(eb.getProjectType());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
index a3e85855..1c88390f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
@@ -152,7 +152,7 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
                         childEnt.setFacCode(facCode);
                         childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo()));
                         //原ebom父级编码 by luohj 240828
-                        childEnt.setSourceParentMaterialNo(vo.getMaterialNo());
+                        childEnt.setSourceParentMaterialNo(eb.getSourceParentMaterialNo());
                         childEnt.setOriginalMaterialNo(eb.getMaterialNo());
                         childEnt.setOriginalNum(eb.getNum());
                         childEnt.setOriginalProjectType(eb.getProjectType());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index c8b4b3c0..2ff85e7c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -122,7 +122,7 @@ public abstract class EBomToPbomBase {
                     childEnt.setFacCode(facCode);
                     childEnt.setIdentityNo(StrUtil.join("-", oldParent.getMaterialNo(), netT.getMaterialNo()));
                     //原ebom父级编码 by luohj 240828
-                    childEnt.setSourceParentMaterialNo(pVo.getMaterialNo());
+                    childEnt.setSourceParentMaterialNo(netT.getSourceParentMaterialNo());
                     childEnt.setOriginalMaterialNo(netT.getMaterialNo());
                     childEnt.setOriginalNum(netT.getNum());
                     childEnt.setOriginalProjectType(netT.getProjectType());