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

转PBOM-维护人员更改

This commit is contained in:
luolm 2024-10-12 22:00:59 +08:00
parent f3ba4c8248
commit 901a68d2b7
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
View File

@ -200,6 +200,10 @@ public abstract class EBomToPbomBase {
oldParent.setDeptName(SessionUtil.getDepartName()); oldParent.setDeptName(SessionUtil.getDepartName());
oldParent.setDeptRowId(SessionUtil.getDepartRowId()); oldParent.setDeptRowId(SessionUtil.getDepartRowId());
oldParent.setEbomVersion(parentVo.getEbomVersion()); 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())){ if(StrUtil.isNotBlank(parentVo.getEbomVersion())){
oldParent.setCurrentVersion(parentVo.getEbomVersion()); oldParent.setCurrentVersion(parentVo.getEbomVersion());
} }
@ -332,6 +336,8 @@ public abstract class EBomToPbomBase {
pBomParent.setDeptRowId(SessionUtil.getDepartRowId()); pBomParent.setDeptRowId(SessionUtil.getDepartRowId());
pBomParent.setCreatedTime(LocalDateTime.now()); pBomParent.setCreatedTime(LocalDateTime.now());
pBomParent.setCreatedBy(SessionUtil.getUserCode()); pBomParent.setCreatedBy(SessionUtil.getUserCode());
pBomParent.setDeviseName(SessionUtil.getRealName());
pBomParent.setDeviseUserCode(SessionUtil.getUserCode());
//版本=EBom版本 //版本=EBom版本
pBomParent.setCurrentVersion(bomVersion); pBomParent.setCurrentVersion(bomVersion);
pBomParent.setEditStatus(PBomEditStatusEnum.HANDLER_CREATED.getValue()); pBomParent.setEditStatus(PBomEditStatusEnum.HANDLER_CREATED.getValue());

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
View File

@ -200,6 +200,10 @@ public abstract class FormalEBomToPbomBase {
oldParent.setCreatedBy(SessionUtil.getUserCode()); oldParent.setCreatedBy(SessionUtil.getUserCode());
oldParent.setDeptName(SessionUtil.getDepartName()); oldParent.setDeptName(SessionUtil.getDepartName());
oldParent.setDeptRowId(SessionUtil.getDepartRowId()); 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){ if(StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
oldParent.setCurrentVersion(parentVo.getCurrentVersion()); oldParent.setCurrentVersion(parentVo.getCurrentVersion());
oldParent.setEbomVersion(parentVo.getCurrentVersion()); oldParent.setEbomVersion(parentVo.getCurrentVersion());
@ -320,6 +324,8 @@ public abstract class FormalEBomToPbomBase {
pBomParent.setCreatedBy(SessionUtil.getUserCode()); pBomParent.setCreatedBy(SessionUtil.getUserCode());
pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue()); pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue()); pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue());
pBomParent.setDeviseName(SessionUtil.getRealName());
pBomParent.setDeviseUserCode(SessionUtil.getUserCode());
//EBOM版本大于pbom版本则用EBOm版本 //EBOM版本大于pbom版本则用EBOm版本
if( oldParent!=null && StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){ if( oldParent!=null && StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
pBomParent.setCurrentVersion(parentVo.getCurrentVersion()); pBomParent.setCurrentVersion(parentVo.getCurrentVersion());