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' into feature/DM/nflg-bom

This commit is contained in:
曹鹏飞 2024-03-15 16:01:06 +08:00
parent a2fe921a5e 0a4e5d4d39
commit 67bc739c1b
3 changed files with 5 additions and 3 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/api/user/BomReportApi.java
View File

@ -75,9 +75,9 @@ public class BomReportApi extends BaseApi {
if (Objects.isNull(query.getQueryType())) { if (Objects.isNull(query.getQueryType())) {
return ResultVO.error(STATE.ParamErr, "请选择查询方式"); return ResultVO.error(STATE.ParamErr, "请选择查询方式");
} else { } else {
if (!(query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SINGLE.getValue()) == 0 if (!(query.getQueryType().compareTo(ReportConstant.QueryTypeEnum.SINGLE.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0 || query.getQueryType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) == 0)) { || query.getQueryType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) == 0)) {
return ResultVO.error(STATE.ParamErr, "错误的查询方式"); return ResultVO.error(STATE.ParamErr, "错误的查询方式");
} }
} }

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

@ -165,6 +165,7 @@ public class EBomForwardReport extends BaseForwardReport {
list) { list) {
ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO(); ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO();
versionVO.setVersion(entity.getCurrentVersion()); versionVO.setVersion(entity.getCurrentVersion());
versionVO.setVersionDesc(entity.getCurrentVersion());
reportBomVersionVO.getVList().add(versionVO); reportBomVersionVO.getVList().add(versionVO);
} }
return reportBomVersionVO; return reportBomVersionVO;

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

@ -177,6 +177,7 @@ public class PBomForwardReport extends BaseForwardReport {
list) { list) {
ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO(); ReportBomVersionVO.QueryBomVersionVO versionVO = new ReportBomVersionVO.QueryBomVersionVO();
versionVO.setVersion(entity.getCurrentVersion()); versionVO.setVersion(entity.getCurrentVersion());
versionVO.setVersionDesc(entity.getCurrentVersion());
reportBomVersionVO.getVList().add(versionVO); reportBomVersionVO.getVList().add(versionVO);
} }
return reportBomVersionVO; return reportBomVersionVO;