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 68102b87..9e6171e3 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 @@ -77,6 +77,8 @@ public class ChangeImpactUpgrade extends EBomToPbomBase { childEnt.setParentRowId(vParent.getRowId()); childEnt.setFacCode(facCode); childEnt.setIdentityNo(StrUtil.join("-", vParent.getMaterialNo(), eb.getMaterialNo())); + //原ebom父级编码 by luohj 240828 + childEnt.setSourceParentMaterialNo(vMaterial.get(0).getMaterialNo()); 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 48354634..a32629e3 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 @@ -96,6 +96,8 @@ public class EBomToPBom extends EBomToPbomBase { childEnt.setSourceRowId(eb.getRowId()); childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo())); childEnt.setOriginalMaterialNo(eb.getMaterialNo()); + //原ebom父级编码 by luohj 240828 + childEnt.setSourceParentMaterialNo(vo.getMaterialNo()); 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 1b328273..00fe3237 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 @@ -136,6 +136,8 @@ public class EBomToPBomFor31 extends EBomToPbomBase { childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo())); childEnt.setSource(PbomSourceEnum.FROM_EBOM.getValue()); childEnt.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue()); + //原ebom父级编码 by luohj 240828 + childEnt.setSourceParentMaterialNo(vo.getMaterialNo()); 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 b02885fa..c6830cb4 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 @@ -106,6 +106,8 @@ public class EBomToPBomForFormal extends EBomToPbomBase { childEnt.setFacCode(facCode); childEnt.setSourceRowId(eb.getRowId()); childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo())); + //原ebom父级编码 by luohj 240828 + childEnt.setSourceParentMaterialNo(vo.getMaterialNo()); 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 199623c6..a3e85855 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 @@ -151,6 +151,8 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase { childEnt.setParentRowId(parentEnt.getRowId()); childEnt.setFacCode(facCode); childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo())); + //原ebom父级编码 by luohj 240828 + childEnt.setSourceParentMaterialNo(vo.getMaterialNo()); 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 a92c4c1a..c8b4b3c0 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 @@ -121,6 +121,8 @@ public abstract class EBomToPbomBase { childEnt.setParentRowId(oldParent.getRowId()); childEnt.setFacCode(facCode); childEnt.setIdentityNo(StrUtil.join("-", oldParent.getMaterialNo(), netT.getMaterialNo())); + //原ebom父级编码 by luohj 240828 + childEnt.setSourceParentMaterialNo(pVo.getMaterialNo()); childEnt.setOriginalMaterialNo(netT.getMaterialNo()); childEnt.setOriginalNum(netT.getNum()); childEnt.setOriginalProjectType(netT.getProjectType());