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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition

This commit is contained in:
10002327 2024-07-30 18:03:06 +08:00
parent 9d7d0367ad f7818bd6fa
commit 5853279a53
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReportBomVO.java
View File

@ -14,6 +14,9 @@ public class ReportBomVO {
private List<ForwardReportVO> childNodes;
@ApiModelProperty("bom版本数量")
private Integer bomNum;
@ApiModelProperty("BOM 类型 0-原始BOM 1-EBom 2-PBom 3-MBom")
private Integer bomType;
@ApiModelProperty("查询方式 0-单层 1-多层 2-汇总")

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

@ -311,7 +311,9 @@ public class EBomForwardReport extends BaseForwardReport {
}
return buildReportBomVo(forwardReportVO, nodesList);
ReportBomVO reportBomVO= buildReportBomVo(forwardReportVO, nodesList);
reportBomVO.setBomNum(listParent.size());
return reportBomVO;
}
@ -484,9 +486,9 @@ public class EBomForwardReport extends BaseForwardReport {
nodesList.addAll(nodeList);
}
return buildReportBomVo(forwardReportVO, nodesList, query.getDataType());
ReportBomVO reportBomVO= buildReportBomVo(forwardReportVO, nodesList, query.getDataType());
reportBomVO.setBomNum(listParent.size());
return reportBomVO;
}
@ -531,7 +533,7 @@ public class EBomForwardReport extends BaseForwardReport {
multiReportObj.getChildNodes().clear();
multiReportObj.getChildNodes().addAll(nodesList);
multiReportObj.setBomNum(bomVesionMap.size());
return multiReportObj;
// List<BomNewEbomParentVO> listParent = getParentV2();

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
View File

@ -328,7 +328,9 @@ public class PBomForwardReport extends BaseForwardReport {
nodesList.addAll(nodeList);
}
return buildReportBomVo(forwardReportVO,nodesList);
ReportBomVO reportBomVO= buildReportBomVo(forwardReportVO,nodesList);
reportBomVO.setBomNum(listParent.size());
return reportBomVO;
}
@ -515,8 +517,9 @@ public class PBomForwardReport extends BaseForwardReport {
nodesList.addAll(nodeList);
}
return buildReportBomVo(forwardReportVO,nodesList,query.getDataType());
ReportBomVO reportBomVO =buildReportBomVo(forwardReportVO,nodesList,query.getDataType());
reportBomVO.setBomNum(listParent.size());
return reportBomVO;
}
/**
@ -557,7 +560,7 @@ public class PBomForwardReport extends BaseForwardReport {
multiReportObj.getChildNodes().clear();
multiReportObj.getChildNodes().addAll(nodesList);
multiReportObj.setBomNum(bomVesionMap.size());
return multiReportObj;