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

optimize(ebom): 从cad和excel导入时，物料编号和图号去除前后空格，以免从主物料查询时查不到数据

This commit is contained in:
曹鹏飞 2024-06-21 09:40:36 +08:00
parent 8dd5c58d8b
commit d597bed3b6
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,8 +114,12 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据，你无需转换");
//物料编号去除前后空格
parents.parallelStream().forEach(u -> u.setMaterialNo(StrUtil.trim(u.getMaterialNo())));
//检查物料编码在主数据中是否存在
List<BomOriginalCadChildEntity> childs = originalCadChildService.lambdaQuery().in(BomOriginalCadChildEntity::getParentRowId, parents.stream().map(u -> u.getRowId()).collect(Collectors.toList())).list();
//物料编号去除前后空格
childs.parallelStream().forEach(u -> u.setMaterialNo(StrUtil.trim(u.getMaterialNo())));
checkMaterialHasExist(parents.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(BomOriginalCadParentEntity::getMaterialNo).collect(Collectors.toList()));
checkMaterialHasExist(childs.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(BomOriginalCadChildEntity::getMaterialNo).collect(Collectors.toList()));

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

@ -261,6 +261,9 @@ public class EBomImportService {
}
}
dto.setMaterialNo(StrUtil.trim(dto.getMaterialNo()));
dto.setDrawingNo(StrUtil.trim(dto.getDrawingNo()));
excelContextTL.get().add(dto);
}