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

Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

This commit is contained in:
BF-202309241046\Administrator 2023-12-10 10:30:14 +08:00
parent 8428a44461 1d6ee020b2
commit f7bb3dc50f
1 changed files with 1 additions and 1 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/MaterialMainService.java
View File

@ -61,7 +61,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
Map<String, BaseMaterialVO> materialMp = ListCommonUtil.listToMap(materialBaseInfos, BaseMaterialVO::getMaterialNo); Map<String, BaseMaterialVO> materialMp = ListCommonUtil.listToMap(materialBaseInfos, BaseMaterialVO::getMaterialNo);
for (T t : data) { for (T t : data) {
if (StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) { if (StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) {
BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t, "material"); BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t, "material","materialTexture");
} }
} }
} }