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:
大米 2024-08-14 16:13:47 +08:00
parent b23e22d9a8 0a3aa2ba26
commit ad91ce1a18
2 changed files with 3 additions and 1 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/service/BomNewEbomParentService.java
View File

@ -2486,7 +2486,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
//根据编号或图号搜索 //根据编号或图号搜索
//从顶级开始查找 //从顶级开始查找
List<BomNewEbomParentVO> roots = result.getRecords().stream() List<BomNewEbomParentVO> roots = result.getRecords().stream()
.filter(r -> StrUtil.equals(r.getMaterialNo(), query.getMaterialNo()) || StrUtil.equals(r.getDrawingNo(), query.getDrawingNo())) .filter(r -> (StrUtil.isNotBlank(query.getMaterialNo()) && StrUtil.equals(r.getMaterialNo(), query.getMaterialNo()))
|| (StrUtil.isNotBlank(query.getDrawingNo()) && StrUtil.equals(r.getDrawingNo(), query.getDrawingNo())))
.collect(Collectors.toList()); .collect(Collectors.toList());
roots.forEach(this::buildChildren); roots.forEach(this::buildChildren);
//从子级开始查找 //从子级开始查找

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

@ -76,6 +76,7 @@ public class DQBomImportService {
EecExcelUtil.handlerExcel(file.getInputStream(), DQbomExcelVO.class, this::handlerExcelRow); EecExcelUtil.handlerExcel(file.getInputStream(), DQbomExcelVO.class, this::handlerExcelRow);
List<DQbomExcelVO> datas = excelContextTL.get(); List<DQbomExcelVO> datas = excelContextTL.get();
VUtils.isTure(datas.isEmpty()).throwMessage("未读取到数据，请检查表头是否正确");
List<OperationErrorMsgVO> errorMsg = checkExcel(datas); List<OperationErrorMsgVO> errorMsg = checkExcel(datas);
if (!errorMsg.isEmpty()) { if (!errorMsg.isEmpty()) {