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

1、F项问题 

2、图号问题
This commit is contained in:
大米 2024-06-25 11:04:47 +08:00
parent 45381290e9
commit 4f928b6839
7 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ public class EBomToPBom extends EBomToPbomBase {
// buildUpgradeChangeDetail(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
//子级
List<BomNewEbomParentVO> child = result.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> child = result.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> mergeChild = mergeChild(child);
if( compareContentIsSame(vo, mergeChild, facCode)){
continue;

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

@ -109,7 +109,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
// buildUpgradeChangeDetail(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
//子级
List<BomNewEbomParentVO> child = facBomDataMp.get(facCode).stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> child = facBomDataMp.get(facCode).stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).collect(Collectors.toList());
List<BomNewEbomParentVO> mergeChild = mergeChild(child);
if( compareContentIsSame(vo, mergeChild, facCode)){
continue;

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

@ -69,7 +69,7 @@ public class EBomToPBomForFormal extends EBomToPbomBase {
// buildUpgradeChangeDetail(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
//子级
List<BomNewEbomParentVO> child = result.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> child = result.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> mergeChild = mergeChild(child);
if( compareContentIsSame(vo, mergeChild, facCode)){
continue;

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

@ -104,7 +104,7 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
// buildUpgradeChangeDetail(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE);
//子级
List<BomNewEbomParentVO> child = facBomDataMp.get(facCode).stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> child = facBomDataMp.get(facCode).stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> mergeChild = mergeChild(child);
if( compareContentIsSame(vo, mergeChild, facCode)){
continue;

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

@ -68,6 +68,9 @@ public abstract class EBomToPbomBase {
protected Set<String> hasBuildVNo = Sets.newHashSet();
//当子级为F项或Z项时-无需转的父级物料
protected Set<String> childDelMaterialNos=new HashSet<>();
public abstract void convert();
/**
@ -586,6 +589,7 @@ public abstract class EBomToPbomBase {
if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) &&
(ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) {
parentBom.setNoConvertToPBomIs(1);
childDelMaterialNos.add(parentBom.getMaterialNo());
}
}
}
@ -608,6 +612,7 @@ public abstract class EBomToPbomBase {
if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) &&
(ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) {
parentBom.setNoConvertToPBomIs(1);
childDelMaterialNos.add(parentBom.getMaterialNo());
}
}

1
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
View File

@ -305,6 +305,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
parentEntity.setMaterialUnit("KG");
parentEntity.setProjectType("L");
parentEntity.setDrawingNo(baseMaterialVO.getDrawingNo());
parentEntity.setRegReplaceIs(1);
} else {
parentEntity.setMaterialDesc(parentEntity.getMaterialName());

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

@ -193,6 +193,8 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc());
parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
parentEntity.setProjectType("L");
parentEntity.setDrawingNo(baseMaterialVO.getDrawingNo());
parentEntity.setChartNo(baseMaterialVO.getDrawingNo());
parentEntity.setRegReplaceIs(1);
}