diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java index c7ed189c..24b1f754 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java @@ -266,6 +266,24 @@ public class BomNewPbomParentEntity implements Serializable { @ApiModelProperty(value = "发布人") private String releaseUserName; + + /** + * 最后一次转MbOM人员 + */ + @TableField(value = "last_convert_mbom_user_name") + @ApiModelProperty(value = "最后一次转MbOM人员") + private String lastConvertMbomUserName; + + + /** + * 最后一次转Mbom时间 + */ + @TableField(value = "last_convert_mbom_time") + @ApiModelProperty(value = "最后一次转Mbom时间") + private LocalDateTime lastConvertMbomTime; + + + /** * 版本过期时间=下个版本的创建时间 */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 66948abc..8c34856f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -742,6 +742,8 @@ public class BomNewPbomParentService extends ServiceImpl bomRowIds = allChild.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList()); rootParent.setStatus(PBomStatusEnum.PUBLISH.getValue()); + rootParent.setLastConvertMbomUserName(SessionUtil.getRealName()); + rootParent.setLastConvertMbomTime(LocalDateTime.now()); this.updateById(rootParent); if (CollUtil.isNotEmpty(bomRowIds)) { this.getBaseMapper().toMBom(PBomStatusEnum.PUBLISH.getValue(), SessionUtil.getRealName(), bomRowIds); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml index fbacd012..92b2ee65 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml @@ -38,6 +38,8 @@ + + @@ -54,7 +56,7 @@ material_texture, material_unit, unit_weight, total_weight, current_version, num, project_type, root_is, should_bom_exist, super_material_status, bom_exist, last_version_is, edit_status, status, user_root_is, virtual_package_is, source_row_id, devise_user_code, devise_name,technology_user_code,technology_user_name, created_by, created_time, created_job, - release_time, release_user_name, expire_end_time, remark, dept_name, level_num, change_desc, notice_nums, + release_time, release_user_name,last_convert_mbom_user_name,last_convert_mbom_time, expire_end_time, remark, dept_name, level_num, change_desc, notice_nums, order_no, modify_time