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

This commit is contained in:
曹鹏飞 2024-04-29 10:31:39 +08:00
commit 8a68c880b8
1 changed files with 2 additions and 2 deletions

View File

@ -292,7 +292,7 @@ public class DQBomImportService {
parent.setLevel(data.getLevel()); parent.setLevel(data.getLevel());
parent.setDrawingNo(data.getDrawingNo()); parent.setDrawingNo(data.getDrawingNo());
parent.setMaterialNo(data.getMaterialNo()); parent.setMaterialNo(data.getMaterialNo());
parent.setMaterialDesc(data.getMaterialName()); parent.setMaterialDesc(data.getMaterialDesc());
parent.setMaterialTexture(data.getMaterialTexture()); parent.setMaterialTexture(data.getMaterialTexture());
parent.setMaterialUnit(data.getMaterialUnit()); parent.setMaterialUnit(data.getMaterialUnit());
parent.setUnitWeight(data.getUnitWeight()); parent.setUnitWeight(data.getUnitWeight());
@ -334,7 +334,7 @@ public class DQBomImportService {
child.setParentRowId(parentRowIdMap.getOrDefault(data.getLevel() - 1, 0L)); child.setParentRowId(parentRowIdMap.getOrDefault(data.getLevel() - 1, 0L));
child.setIdentityNo(child.getParentRowId() + "_" + child.getRowId()); child.setIdentityNo(child.getParentRowId() + "_" + child.getRowId());
child.setLevel(data.getLevel()); child.setLevel(data.getLevel());
child.setMaterialDesc(data.getMaterialName()); child.setMaterialDesc(data.getMaterialDesc());
child.setMaterialTexture(data.getMaterialTexture()); child.setMaterialTexture(data.getMaterialTexture());
child.setMaterialUnit(data.getMaterialUnit()); child.setMaterialUnit(data.getMaterialUnit());
child.setUnitWeight(data.getUnitWeight()); child.setUnitWeight(data.getUnitWeight());