feat(ebom): 从cad获取数据并转到ebom时,如果是31编码的,设置下级的关联编号以供后续生成虚拟包使用
This commit is contained in:
parent
d8e8e60a9f
commit
a672698303
|
|
@ -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();
|
BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity();
|
||||||
BeanUtil.copyProperties(child, childEntity, "materialGetType");
|
BeanUtil.copyProperties(child, childEntity, "materialGetType");
|
||||||
childEntity.setRowId(IdWorker.getId());
|
childEntity.setRowId(IdWorker.getId());
|
||||||
childEntity.setParentRowId(parentRowId);
|
childEntity.setParentRowId(parent.getEBomRowId());
|
||||||
childEntity.setIdentityNo(StrUtil.join("_", parentRowId.toString(), childEntity.getRowId()));
|
childEntity.setIdentityNo(StrUtil.join("_", parent.getEBomRowId().toString(), childEntity.getRowId()));
|
||||||
childEntity.setModifyTime(LocalDateTime.now());
|
childEntity.setModifyTime(LocalDateTime.now());
|
||||||
childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString());
|
childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString());
|
||||||
//当为原材料时,数量=总重 单位改为KG 图号=编码
|
//当为原材料时,数量=总重 单位改为KG 图号=编码
|
||||||
|
|
@ -428,6 +428,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
|
||||||
// childEntity.setDrawingNo(childEntity.getMaterialNo());
|
// childEntity.setDrawingNo(childEntity.getMaterialNo());
|
||||||
// }
|
// }
|
||||||
childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
|
childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
|
||||||
|
if (parent.getMaterialNo().startsWith("31")) {
|
||||||
|
childEntity.setVirtualPartRootMaterialNo(parent.getMaterialNo());
|
||||||
|
}
|
||||||
this.eBomChildResult.add(childEntity);
|
this.eBomChildResult.add(childEntity);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue