diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index fd993474..6204683e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -200,6 +200,10 @@ public abstract class EBomToPbomBase { oldParent.setDeptName(SessionUtil.getDepartName()); oldParent.setDeptRowId(SessionUtil.getDepartRowId()); oldParent.setEbomVersion(parentVo.getEbomVersion()); + oldParent.setDeviseName(SessionUtil.getRealName()); + oldParent.setDeviseUserCode(SessionUtil.getUserCode()); + oldParent.setTechnologyUserCode(SessionUtil.getUserCode()); + oldParent.setTechnologyUserName(SessionUtil.getUserName()); if(StrUtil.isNotBlank(parentVo.getEbomVersion())){ oldParent.setCurrentVersion(parentVo.getEbomVersion()); } @@ -332,6 +336,8 @@ public abstract class EBomToPbomBase { pBomParent.setDeptRowId(SessionUtil.getDepartRowId()); pBomParent.setCreatedTime(LocalDateTime.now()); pBomParent.setCreatedBy(SessionUtil.getUserCode()); + pBomParent.setDeviseName(SessionUtil.getRealName()); + pBomParent.setDeviseUserCode(SessionUtil.getUserCode()); //版本=EBom版本 pBomParent.setCurrentVersion(bomVersion); pBomParent.setEditStatus(PBomEditStatusEnum.HANDLER_CREATED.getValue()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java index fa423a46..7d25b4b9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java @@ -200,6 +200,10 @@ public abstract class FormalEBomToPbomBase { oldParent.setCreatedBy(SessionUtil.getUserCode()); oldParent.setDeptName(SessionUtil.getDepartName()); oldParent.setDeptRowId(SessionUtil.getDepartRowId()); + oldParent.setDeviseUserCode(SessionUtil.getUserCode()); + oldParent.setDeviseName(SessionUtil.getRealName()); + oldParent.setTechnologyUserName(SessionUtil.getRealName()); + oldParent.setTechnologyUserCode(SessionUtil.getUserCode()); if(StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){ oldParent.setCurrentVersion(parentVo.getCurrentVersion()); oldParent.setEbomVersion(parentVo.getCurrentVersion()); @@ -320,6 +324,8 @@ public abstract class FormalEBomToPbomBase { pBomParent.setCreatedBy(SessionUtil.getUserCode()); pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue()); pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue()); + pBomParent.setDeviseName(SessionUtil.getRealName()); + pBomParent.setDeviseUserCode(SessionUtil.getUserCode()); //EBOM版本大于pbom版本则用EBOm版本 if( oldParent!=null && StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){ pBomParent.setCurrentVersion(parentVo.getCurrentVersion());