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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition 

# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
This commit is contained in:
曹鹏飞 2024-06-27 17:05:15 +08:00
parent 3942fb2a70 910f7d637a
commit 711c104a91
1 changed files with 3 additions and 1 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/service/domain/BaseForwardReport.java
View File

@ -161,7 +161,9 @@ public abstract class BaseForwardReport {
reportBomVO.setBomType(query.getBomType()); reportBomVO.setBomType(query.getBomType());
reportBomVO.setQueryType(query.getQueryType()); reportBomVO.setQueryType(query.getQueryType());
reportBomVO.setDataType(dataType); reportBomVO.setDataType(dataType);
parent.setBomRowId(parent.getRowId()); if(Objects.nonNull(parent)) {
parent.setBomRowId(parent.getRowId());
}
reportBomVO.setParent(parent); reportBomVO.setParent(parent);
reportBomVO.setChildNodes(childNode); reportBomVO.setChildNodes(childNode);
return reportBomVO; return reportBomVO;