This commit is contained in:
parent
61f913a953
commit
99bb2bb994
|
|
@ -1421,6 +1421,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
|
BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
|
||||||
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
|
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
|
||||||
|
|
||||||
|
//继承bom的状态
|
||||||
|
if (bomParent != null) {
|
||||||
|
baseMaterialVO.setEditStatus(bomParent.getEditStatus());
|
||||||
|
baseMaterialVO.setStatus(bomParent.getStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
|
// baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
|
||||||
baseMaterialVO.setRowId(query.getRowId());
|
baseMaterialVO.setRowId(query.getRowId());
|
||||||
baseMaterialVO.setParentRowId(query.getBomRowId());
|
baseMaterialVO.setParentRowId(query.getBomRowId());
|
||||||
|
|
@ -1440,10 +1447,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
|
||||||
if(ObjectUtil.isNull(baseMaterialVO.getNum())){
|
if(ObjectUtil.isNull(baseMaterialVO.getNum())){
|
||||||
baseMaterialVO.setNum(new BigDecimal(1));
|
baseMaterialVO.setNum(new BigDecimal(1));
|
||||||
}
|
}
|
||||||
if (bomParent != null) {
|
|
||||||
baseMaterialVO.setEditStatus(bomParent.getEditStatus());
|
|
||||||
baseMaterialVO.setStatus(bomParent.getStatus());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())
|
if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue