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

转PBOM-bug修复

This commit is contained in:
大米 2024-11-13 17:02:38 +08:00
parent 721287c899
commit 60a807daec
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,16 +271,18 @@ public abstract class EBomToPbomBase {
//创建工艺包版本
BomNewPbomParentEntity artParent = buildPBomParent(Convert.convert(BomNewEbomParentVO.class, oldPBomAddItem), facCode, parentList);
//old 工艺包子级
List<BomNewPbomParentVO> oldArtChildren = SpringUtil.getBean(BomNewPbomParentService.class).getChild(oldPBomAddItem.getBomRowId(), 1);
for (BomNewPbomParentVO oldArtChild : oldArtChildren) {
//工艺包新增
if (StrUtil.isBlank(oldArtChild.getOriginalMaterialNo())) {
buildPBomAddChild(artParent, facCode, oldArtChild);
}
if(StrUtil.isNotBlank(oldArtChild.getOriginalMaterialNo()) && newBomChildrenMap.containsKey(oldArtChild.getOriginalMaterialNo())){
// newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()).setParentRowId(artParent.getRowId());
buildPBomAddChild(artParent, facCode, Convert.convert(BomNewPbomParentVO.class,newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()) ));
delResult.add(oldArtChild.getOriginalMaterialNo());
if(Objects.nonNull(artParent)) {
List<BomNewPbomParentVO> oldArtChildren = SpringUtil.getBean(BomNewPbomParentService.class).getChild(oldPBomAddItem.getBomRowId(), 1);
for (BomNewPbomParentVO oldArtChild : oldArtChildren) {
//工艺包新增
if (StrUtil.isBlank(oldArtChild.getOriginalMaterialNo())) {
buildPBomAddChild(artParent, facCode, oldArtChild);
}
if (StrUtil.isNotBlank(oldArtChild.getOriginalMaterialNo()) && newBomChildrenMap.containsKey(oldArtChild.getOriginalMaterialNo())) {
// newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()).setParentRowId(artParent.getRowId());
buildPBomAddChild(artParent, facCode, Convert.convert(BomNewPbomParentVO.class, newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo())));
delResult.add(oldArtChild.getOriginalMaterialNo());
}
}
}
}

22
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
View File

@ -275,16 +275,18 @@ public abstract class FormalEBomToPbomBase {
//创建工艺包版本
BomNewPbomParentEntity artParent = buildPBomParent(Convert.convert(BomNewEbomParentVO.class, oldPBomAddItem), facCode, parentList);
//old 工艺包子级
List<BomNewPbomParentVO> oldArtChildren = SpringUtil.getBean(BomNewPbomParentService.class).getChild(oldPBomAddItem.getBomRowId(), 1);
for (BomNewPbomParentVO oldArtChild : oldArtChildren) {
//工艺包新增
if (StrUtil.isBlank(oldArtChild.getOriginalMaterialNo())) {
buildPBomAddChild(artParent, facCode, oldArtChild);
}
if(StrUtil.isNotBlank(oldArtChild.getOriginalMaterialNo()) && newBomChildrenMap.containsKey(oldArtChild.getOriginalMaterialNo())){
// newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()).setParentRowId(artParent.getRowId());
buildPBomAddChild(artParent, facCode, Convert.convert(BomNewPbomParentVO.class,newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()) ));
delResult.add(oldArtChild.getOriginalMaterialNo());
if(Objects.nonNull(artParent)) {
List<BomNewPbomParentVO> oldArtChildren = SpringUtil.getBean(BomNewPbomParentService.class).getChild(oldPBomAddItem.getBomRowId(), 1);
for (BomNewPbomParentVO oldArtChild : oldArtChildren) {
//工艺包新增
if (StrUtil.isBlank(oldArtChild.getOriginalMaterialNo())) {
buildPBomAddChild(artParent, facCode, oldArtChild);
}
if (StrUtil.isNotBlank(oldArtChild.getOriginalMaterialNo()) && newBomChildrenMap.containsKey(oldArtChild.getOriginalMaterialNo())) {
// newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()).setParentRowId(artParent.getRowId());
buildPBomAddChild(artParent, facCode, Convert.convert(BomNewPbomParentVO.class, newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo())));
delResult.add(oldArtChild.getOriginalMaterialNo());
}
}
}
}