diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index 11de0fdb..22e37a5b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -312,7 +312,11 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { parentEntity.setMaterialName(baseMaterialVO.getMaterialName()); parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc()); parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture()); - parentEntity.setMaterialUnit("KG"); + parentEntity.setMaterialUnit(baseMaterialVO.getMaterialUnit()); + if(!baseMaterialVO.getMaterialUnit().equalsIgnoreCase("KG")){ + parentEntity.setNum(null); + } +// parentEntity.setMaterialUnit("KG"); parentEntity.setProjectType("L"); parentEntity.setDrawingNo(baseMaterialVO.getDrawingNo()); parentEntity.setRegReplaceIs(1); @@ -321,6 +325,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { } + } private BaseMaterialVO getCommonMaterialByRel(BomOriginalListVO parentEntity) { @@ -358,7 +363,11 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { childEntity.setUnitWeight(parentV.getUnitWeight()); childEntity.setNum(parentV.getUnitWeight()); childEntity.setCreatedBy(SessionUtil.getUserCode()); - childEntity.setMaterialUnit("KG"); + if(!material.getMaterialUnit().equalsIgnoreCase("KG")){ + childEntity.setNum(null); + } + childEntity.setMaterialUnit(material.getMaterialUnit()); +// childEntity.setMaterialUnit("KG"); childEntity.setProjectType("L"); childEntity.setMaterialOriginalUnit(material.getMaterialUnit()); childEntity.setSourceRowId(parentV.getRowId().toString());