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

Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition

This commit is contained in:
大米 2024-07-23 09:01:30 +08:00
parent 98a8405682 33e44fb6d1
commit a8e1ee5737
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1249,9 +1249,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
newParent.setRevertUserName(null); newParent.setRevertUserName(null);
newParent.setAuditUserName(null); newParent.setAuditUserName(null);
newParent.setAuditTime(null); newParent.setAuditTime(null);
newParent.setRootIs(this.getBaseMapper().isRoot(parent.getMaterialNo())>0?0:1); newParent.setRootIs(1);
newParent.setUserRootIs(this.getBaseMapper().isUserRoot(parent.getMaterialNo(),SessionUtil.getUserCode())>0?0:1); newParent.setUserRootIs(1);
newParent.setRootIsForWaitReview(this.getBaseMapper().isRootIsForWaitReview(parent.getMaterialNo())>0?0:1);
newParent.setSapState(1); newParent.setSapState(1);
newParent.setSapTime(null); newParent.setSapTime(null);
newParent.setModifyTime(null); newParent.setModifyTime(null);
@ -1865,7 +1864,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
if (childEntity != null) { if (childEntity != null) {
//编辑查询物料id未变化 //编辑查询物料id未变化
if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) || childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) { if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) && childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) {
BeanUtil.copyProperties(childEntity, baseMaterialVO); BeanUtil.copyProperties(childEntity, baseMaterialVO);
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
return baseMaterialVO; return baseMaterialVO;