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

转pbom-pbom中有手工新增的时，兼容历史数据

This commit is contained in:
大米 2024-09-09 15:52:15 +08:00
parent 46252f8f4d
commit ff6d7641bd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,8 +245,10 @@ public abstract class EBomToPbomBase {
Map<String, BomNewEbomParentVO> newBomChildrenMap = newBomChildren.stream().collect(Collectors.toMap(BomNewEbomParentVO::getMaterialNo, u -> u)); Map<String, BomNewEbomParentVO> newBomChildrenMap = newBomChildren.stream().collect(Collectors.toMap(BomNewEbomParentVO::getMaterialNo, u -> u));
for (BomNewPbomParentVO oldPBomAddItem : oldPBomAddChildren) { for (BomNewPbomParentVO oldPBomAddItem : oldPBomAddChildren) {
//加入当前BOM明细中 //加入当前BOM明细中(新增的且新的子级中不包含该物料编码--主要考虑兼容历史数据)
buildPBomAddChild(parent, facCode, oldPBomAddItem); if(!newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) {
buildPBomAddChild(parent, facCode, oldPBomAddItem);
}
//如为工艺包，且在当前BOM中不存在 //如为工艺包，且在当前BOM中不存在
if (BomConstant.ART_PACKAGE_MATERIAL_CATEGORY_CODE.equals(oldPBomAddItem.getMaterialCategoryCode()) && !newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) { if (BomConstant.ART_PACKAGE_MATERIAL_CATEGORY_CODE.equals(oldPBomAddItem.getMaterialCategoryCode()) && !newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) {