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

Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

This commit is contained in:
jing's 2024-01-22 09:33:09 +08:00
parent c8f4b6e697 e8f7ef564d
commit 79637ce6f3
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java
View File

@ -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;
/**
* 版本过期时间=下个版本的创建时间
*/

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

@ -742,6 +742,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
List<Long> 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);

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
View File

@ -38,6 +38,8 @@
<result column="created_job" property="createdJob" jdbcType="INTEGER"/>
<result column="release_time" property="releaseTime" jdbcType="TIMESTAMP"/>
<result column="release_user_name" property="releaseUserName" jdbcType="VARCHAR"/>
<result column="last_convert_mbom_user_name" property="lastConvertMbomUserName" jdbcType="VARCHAR"/>
<result column="last_convert_mbom_time" property="lastConvertMbomTime" jdbcType="TIMESTAMP" />
<result column="expire_end_time" property="expireEndTime" jdbcType="TIMESTAMP"/>
<result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="dept_name" property="deptName" jdbcType="VARCHAR"/>
@ -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
</sql>