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 9d29bbf5..bf3332f8 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 @@ -268,7 +268,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { } } - buildEBomChild(childVo, parentEntity.getEBomRowId()); + buildEBomChild(childVo, parentEntity); } } @@ -411,14 +411,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { } - private void buildEBomChild(BomOriginalListVO child, Long parentRowId) { + private void buildEBomChild(BomOriginalListVO child, BomOriginalListVO parent) { BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity(); BeanUtil.copyProperties(child, childEntity, "materialGetType"); childEntity.setRowId(IdWorker.getId()); - childEntity.setParentRowId(parentRowId); - childEntity.setIdentityNo(StrUtil.join("_", parentRowId.toString(), childEntity.getRowId())); + childEntity.setParentRowId(parent.getEBomRowId()); + childEntity.setIdentityNo(StrUtil.join("_", parent.getEBomRowId().toString(), childEntity.getRowId())); childEntity.setModifyTime(LocalDateTime.now()); childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString()); //当为原材料时,数量=总重 单位改为KG 图号=编码 @@ -428,6 +428,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { // childEntity.setDrawingNo(childEntity.getMaterialNo()); // } childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit()); + if (parent.getMaterialNo().startsWith("31")) { + childEntity.setVirtualPartRootMaterialNo(parent.getMaterialNo()); + } this.eBomChildResult.add(childEntity);