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

Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-28 17:59:16 +08:00
parent 07c0575f0a b71ca6e6a7
commit 788397fdc0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,6 +695,7 @@ public class DQBomService {
vo.setMaterialTexture(d.getMaterialTexture()); vo.setMaterialTexture(d.getMaterialTexture());
vo.setMaterialUnit(d.getMaterialUnit()); vo.setMaterialUnit(d.getMaterialUnit());
vo.setCategoryName(d.getCategoryName()); vo.setCategoryName(d.getCategoryName());
vo.setRelCategoryCode(d.getRelCategoryCode());
QueryMaterialsQuery q = query.stream() QueryMaterialsQuery q = query.stream()
.filter(f -> StrUtil.equals(f.getMaterialNo(), vo.getMaterialNo()) || StrUtil.equals(f.getDrawingNo(), vo.getDrawingNo())) .filter(f -> StrUtil.equals(f.getMaterialNo(), vo.getMaterialNo()) || StrUtil.equals(f.getDrawingNo(), vo.getDrawingNo()))
.findFirst() .findFirst()
@ -727,6 +728,7 @@ public class DQBomService {
vo.setMaterialTexture(d.getMaterialTexture()); vo.setMaterialTexture(d.getMaterialTexture());
vo.setMaterialUnit(d.getMaterialUnit()); vo.setMaterialUnit(d.getMaterialUnit());
vo.setCategoryName(d.getCategoryName()); vo.setCategoryName(d.getCategoryName());
vo.setRelCategoryCode(d.getRelCategoryCode());
if (Objects.nonNull(query.getUnitWeight())) { if (Objects.nonNull(query.getUnitWeight())) {
vo.setUnitWeight(query.getUnitWeight()); vo.setUnitWeight(query.getUnitWeight());
} }