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

注释无用

This commit is contained in:
jing's 2024-07-05 21:18:59 +08:00
parent 5ba378b684
commit 7ec1387c85
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,32 +78,32 @@ public class PBomForwardReport extends BaseForwardReport {
}
QueryWrapper<BomNewPbomParentFormalEntity> buildQuery() {
QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getMaterialNo, query.getMaterialNo());
if (StrUtil.isNotBlank(query.getDrawingNo())) {
queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getDrawingNo, query.getDrawingNo());
}
if (StrUtil.isNotBlank(query.getFacCode())) {
queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getFacCode, query.getFacCode());
}
if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0) {
queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, getMaxVersion());
} else if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue() ) == 0){
queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, query.getBomVersion());
}
if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) {
queryWrapper.lambda().ge(BomNewPbomParentFormalEntity::getCreatedTime, query.getStartDate())
.le(BomNewPbomParentFormalEntity::getReleaseTime, query.getEndDate());
}
return queryWrapper;
}
// QueryWrapper<BomNewPbomParentFormalEntity> buildQuery() {
// QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = new QueryWrapper<>();
// queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getMaterialNo, query.getMaterialNo());
//
// if (StrUtil.isNotBlank(query.getDrawingNo())) {
// queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getDrawingNo, query.getDrawingNo());
// }
//
// if (StrUtil.isNotBlank(query.getFacCode())) {
// queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getFacCode, query.getFacCode());
// }
//
// if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0) {
// queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, getMaxVersion());
// } else if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue() ) == 0){
// queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, query.getBomVersion());
// }
//
// if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) {
//
// queryWrapper.lambda().ge(BomNewPbomParentFormalEntity::getCreatedTime, query.getStartDate())
// .le(BomNewPbomParentFormalEntity::getReleaseTime, query.getEndDate());
//
// }
// return queryWrapper;
// }
List<BomNewPbomParentVO> getParentChildList(List<Long> bomRowId) {
List<BomNewPbomParentVO> parentChildList = null;
@ -142,14 +142,14 @@ public class PBomForwardReport extends BaseForwardReport {
List<BomNewPbomParentFormalEntity> getParent() {
QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = buildQuery();
List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper);
// if (CollectionUtil.isEmpty(list)) {
// throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo()));
// }
return list;
}
// List<BomNewPbomParentFormalEntity> getParent() {
// QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = buildQuery();
// List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper);
// // if (CollectionUtil.isEmpty(list)) {
// // throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo()));
// // }
// return list;
// }
List<BomNewPbomParentVO> getParentV2() {