diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java index c804319b..829b815d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java @@ -172,6 +172,7 @@ public class MBomForwardReport extends BaseForwardReport { List rowIdList = new ArrayList<>( Arrays.asList(rowId) ); List reportVOList = new ArrayList<>(); orderNum.set(0); + while (!rowIdList.isEmpty()) { List childList = SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().getParentChild(rowIdList, bomRowId); rowIdList.clear(); @@ -206,8 +207,17 @@ public class MBomForwardReport extends BaseForwardReport { if(ObjectUtil.equal(item.getRowId(),item.getBomRowId())){ rowId = 0l; } - listMap.put(item.getRowId(), queryDetail(isMore, rowId, item.getBomRowId())); - } + List list= queryDetail(isMore, rowId, item.getBomRowId()); + + BomNewMbomParentEntity parentEntity= SpringUtil.getBean(BomNewMbomParentService.class).getById(item.getBomRowId()); + list.forEach(u->{ + u.setCurrentVersion(parentEntity.getCurrentVersion()); + }); + + listMap.put(item.getRowId(), list ); + + + } } return listMap;