diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 27ca3154..8bcf24d0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -294,6 +294,8 @@ public class EBomImportService { child.setDrawingNo(parent.getDrawingNo()); child.setMaterialDesc(parent.getMaterialDesc()); child.setUnitWeight(parent.getUnitWeight()); + child.setMaterialUnit(parent.getMaterialUnit()); + child.setMaterialOriginalUnit(parent.getMaterialOriginalUnit()); child.setNum(parent.getNum()); child.setTotalWeight(parent.getTotalWeight()); child.setProjectType(projectType); @@ -324,11 +326,12 @@ public class EBomImportService { parent.setUnitWeight(vo.getMaterialWeight()); parent.setMaterialName(vo.getMaterialName()); parent.setMaterialTexture(vo.getMaterialTexture()); + parent.setMaterialUnit(vo.getMaterialUnit()); if (StrUtil.isBlank(data.getMaterialDesc())) { parent.setMaterialDesc(vo.getMaterialDesc()); } } - parent.setMaterialUnit(data.getUnit()); + parent.setMaterialOriginalUnit(data.getUnit()); parent.setNum(data.getNum()); parent.setTotalWeight(BomUtil.calculateTotalWeight(parent.getNum(), parent.getUnitWeight())); parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION); @@ -382,11 +385,12 @@ public class EBomImportService { parent.setUnitWeight(vo.getMaterialWeight()); parent.setMaterialName(vo.getMaterialName()); parent.setMaterialTexture(vo.getMaterialTexture()); + parent.setMaterialUnit(vo.getMaterialUnit()); + parent.setMaterialOriginalUnit(vo.getMaterialUnit()); if (StrUtil.isBlank(materialDesc)) { parent.setMaterialDesc(vo.getMaterialDesc()); } } - parent.setMaterialUnit("PC"); //parent.setUnitWeight(BigDecimal.ZERO); parent.setNum(BigDecimal.ONE); //parent.setTotalWeight(BomUtil.calculateTotalWeight(data.getNum(), data.getUnitWeight()));