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

optimize(pbom查看): 查不到物料信息时不在提示错误信息

This commit is contained in:
曹鹏飞 2024-06-27 15:53:51 +08:00
parent 0d587b3ea9
commit 9a92cb535d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nflg.product.base.core.exception.NflgBusinessException;
import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.OriginalConstant; import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.ReportConstant; import com.nflg.product.bomnew.constant.ReportConstant;
@ -23,7 +22,6 @@ import com.nflg.product.bomnew.service.domain.BaseForwardReport;
import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.ListCommonUtil;
import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil; import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil;
import com.nflg.product.bomnew.util.VersionUtil; import com.nflg.product.bomnew.util.VersionUtil;
import nflg.product.common.constant.STATE;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -196,21 +194,21 @@ public class PBomForwardReport extends BaseForwardReport {
queryWrapper.lambda().orderByAsc(BomNewPbomParentFormalEntity::getCurrentVersion); queryWrapper.lambda().orderByAsc(BomNewPbomParentFormalEntity::getCurrentVersion);
List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper); List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper);
if (CollectionUtil.isEmpty(list)) { // if (CollectionUtil.isEmpty(list)) {
throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码{}版本信息", query.getMaterialNo())); // throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码{}版本信息", query.getMaterialNo()));
} // }
BomNewPbomParentFormalEntity item0 = list.get(0);
ReportBomVersionVO reportBomVersionVO = new ReportBomVersionVO(); ReportBomVersionVO reportBomVersionVO = new ReportBomVersionVO();
if (CollUtil.isNotEmpty(list)) {
BomNewPbomParentFormalEntity item0 = list.get(0);
reportBomVersionVO.setMaterialDesc(item0.getMaterialDesc()); reportBomVersionVO.setMaterialDesc(item0.getMaterialDesc());
reportBomVersionVO.setVList(new ArrayList<>()); reportBomVersionVO.setVList(new ArrayList<>());
for (BomNewPbomParentFormalEntity entity : for (BomNewPbomParentFormalEntity entity : 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()); versionVO.setVersionDesc(entity.getCurrentVersion());
reportBomVersionVO.getVList().add(versionVO); reportBomVersionVO.getVList().add(versionVO);
} }
}
return reportBomVersionVO; return reportBomVersionVO;
} }