rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-pbom-lhj0827' into feature/DM/nflg-bom-transition

This commit is contained in:
10001392 2024-08-28 22:00:33 +08:00
parent 4fb3dfa2b2 c6451c8189
commit df4b9ceaa2
9 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java
View File

@ -300,6 +300,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;

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
View File

@ -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();

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
View File

@ -1360,6 +1360,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);

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
View File

@ -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());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
View File

@ -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());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
View File

@ -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());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal.java
View File

@ -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());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
View File

@ -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());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
View File

@ -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());