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

条件

This commit is contained in:
jing's 2024-02-21 14:02:02 +08:00
parent c282f9aebe
commit 304e73479d
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
View File

@ -48,10 +48,10 @@ public class BomReportApi extends BaseApi {
if (Objects.isNull(query.getBomType())) { if (Objects.isNull(query.getBomType())) {
return ResultVO.error(STATE.ParamErr, "请选择BOM类型"); return ResultVO.error(STATE.ParamErr, "请选择BOM类型");
} else { } else {
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) != 0 if ( !(query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) != 0 || query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) != 0 || query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) != 0) { || query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) == 0)) {
return ResultVO.error(STATE.ParamErr, "错误的BOM类型"); return ResultVO.error(STATE.ParamErr, "错误的BOM类型");
} }
@ -62,19 +62,19 @@ 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.getBomType().compareTo(ReportConstant.QueryTypeEnum.SINGLE.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) != 0 || query.getBomType().compareTo(ReportConstant.QueryTypeEnum.MULTI.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) != 0) { || query.getBomType().compareTo(ReportConstant.QueryTypeEnum.SUM.getValue()) == 0)) {
return ResultVO.error(STATE.ParamErr, "错误的查询方式"); return ResultVO.error(STATE.ParamErr, "错误的查询方式");
} }
} }
if (Objects.isNull(query.getBomVersion())) { if (Objects.isNull(query.getVersionStrategy())) {
return ResultVO.error(STATE.ParamErr, "请选择版本策略"); return ResultVO.error(STATE.ParamErr, "请选择版本策略");
} else { } else {
if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) != 0 if (!(query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0
|| query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.ALL.getValue()) != 0 || query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.ALL.getValue()) == 0
|| query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue()) != 0) { || query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue()) == 0)) {
return ResultVO.error(STATE.ParamErr, "错误的版本策略"); return ResultVO.error(STATE.ParamErr, "错误的版本策略");
} }
} }
@ -101,10 +101,10 @@ public class BomReportApi extends BaseApi {
if (Objects.isNull(query.getBomType())) { if (Objects.isNull(query.getBomType())) {
return ResultVO.error(STATE.ParamErr, "请选择BOM类型"); return ResultVO.error(STATE.ParamErr, "请选择BOM类型");
} else { } else {
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) != 0 if (!(query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) != 0 || query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) != 0 || query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) == 0
|| query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) != 0) { || query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) == 0)) {
return ResultVO.error(STATE.ParamErr, "错误的BOM类型"); return ResultVO.error(STATE.ParamErr, "错误的BOM类型");
} }

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

@ -119,6 +119,7 @@ public class EBomForwardReport extends BaseForwardReport {
for (ForwardReportVO vo : for (ForwardReportVO vo :
nodeList) { nodeList) {
vo.setCreatedTime(forwardReportVO.getCreatedTime()); vo.setCreatedTime(forwardReportVO.getCreatedTime());
vo.setLevelNum(1);
// vo.setOrderNumber(""); // vo.setOrderNumber("");
} }

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

@ -127,7 +127,7 @@ public class PBomForwardReport extends BaseForwardReport {
for (ForwardReportVO vo : for (ForwardReportVO vo :
nodeList) { nodeList) {
vo.setCreatedTime(forwardReportVO.getCreatedTime()); vo.setCreatedTime(forwardReportVO.getCreatedTime());
vo.setLevelNum(1);
} }
} }