rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选中某一个物料，按回车键，然后单击更新物料行/暂存/提交时，此物料会被删除

This commit is contained in:
jing's 2024-01-24 23:19:58 +08:00
parent 7b938cfd50
commit 9998d74ffb
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -1230,30 +1230,44 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
BomNewEbomParentEntity bomParent=null; BomNewEbomParentEntity bomParent=null;
BomNewEbomChildEntity childEntity=null;
if(query.getBomRowId()!=null){ if(query.getBomRowId()!=null && query.getBomRowId().longValue()!=0){
bomParent= getById(query.getBomRowId()); bomParent= getById(query.getBomRowId());
} }
if(query.getRowId()!=null && query.getRowId().longValue()!=0){
childEntity= SpringUtil.getBean(BomNewEbomChildService.class).getById(query.getRowId());
}
if (CollUtil.isNotEmpty(materialMainList)) { if (CollUtil.isNotEmpty(materialMainList)) {
MaterialMainEntity materialMainEntity = materialMainList.get(0); MaterialMainEntity materialMainEntity = materialMainList.get(0);
BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO(); BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO();
if(childEntity!=null){
BeanUtil.copyProperties(childEntity, baseMaterialVO);
if(childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo())){
return baseMaterialVO;
}
}
BeanUtil.copyProperties(materialMainEntity, baseMaterialVO); BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO)); SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
// baseMaterialVO.setCreatedBy(SessionUtil.getUserCode()); // baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
baseMaterialVO.setRowId(query.getRowId()); baseMaterialVO.setRowId(query.getRowId());
materialMainEntity.setProjectType(null); baseMaterialVO.setParentRowId(query.getBomRowId());
baseMaterialVO.setProjectType(null);
baseMaterialVO.setDeptName(SessionUtil.getDepartName()); baseMaterialVO.setDeptName(SessionUtil.getDepartName());
baseMaterialVO.setDeviseUserCode(SessionUtil.getUserCode()); baseMaterialVO.setDeviseUserCode(SessionUtil.getUserCode());
baseMaterialVO.setDeviseName(SessionUtil.getRealName()); baseMaterialVO.setDeviseName(SessionUtil.getRealName());
baseMaterialVO.setCreatedBy(SessionUtil.getUserCode()); baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
baseMaterialVO.setCreatedTime(LocalDateTime.now()); baseMaterialVO.setCreatedTime(LocalDateTime.now());
baseMaterialVO.setModifyTime(LocalDateTime.now()); baseMaterialVO.setModifyTime(LocalDateTime.now());
baseMaterialVO.setSource(EBomSourceEnum.FROM_MDM.getValue());
if(StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) { if(StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight())); baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
} }