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

添加模型dept_row_id

This commit is contained in:
jing's 2024-06-20 15:43:48 +08:00
parent 0fb12afba0
commit 4f86a44420
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
View File

@ -272,6 +272,10 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
*/ */
@ApiModelProperty(value = "设计维护部门名称") @ApiModelProperty(value = "设计维护部门名称")
private String deptName; private String deptName;
@ApiModelProperty(value = "创建人所属部门rowId")
private Long deptRowId;
/** /**
* bom树的高度 * bom树的高度

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

@ -1964,6 +1964,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
eBomEdit.nextVersion(); eBomEdit.nextVersion();
this.saveOrUpdate(eBomEdit.getParentEntity()); this.saveOrUpdate(eBomEdit.getParentEntity());
} }
if (CollUtil.isNotEmpty(eBomEdit.childEntities)) { if (CollUtil.isNotEmpty(eBomEdit.childEntities)) {

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

@ -72,6 +72,7 @@ public class EBomEdit {
parent.setCurrentVersion("A00"); parent.setCurrentVersion("A00");
parent.setDeviseName(SessionUtil.getRealName()); parent.setDeviseName(SessionUtil.getRealName());
parent.setDeptName(SessionUtil.getDepartName()); parent.setDeptName(SessionUtil.getDepartName());
parent.setDeptRowId(SessionUtil.getDepartRowId());
parent.setSourceRowId(""); parent.setSourceRowId("");
parent.setSource(source); parent.setSource(source);
parent.setStatus(EBomStatusEnum.WAIT_CHECK.getValue()); parent.setStatus(EBomStatusEnum.WAIT_CHECK.getValue());
@ -352,8 +353,10 @@ public class EBomEdit {
if (dto.getParent().getBomRowId() == null || dto.getParent().getBomRowId().longValue() == 0) { if (dto.getParent().getBomRowId() == null || dto.getParent().getBomRowId().longValue() == 0) {
checkHadBom(dto.getParent().getMaterialNo()); checkHadBom(dto.getParent().getMaterialNo());
dto.getParent().setBomRowId(dto.getParent().getRowId());
parentEntity = createParentBomInfo(dto.getParent()); parentEntity = createParentBomInfo(dto.getParent());
// dto.getParent().setBomRowId(dto.getParent().getRowId());
dto.getDatas().forEach(k -> { dto.getDatas().forEach(k -> {
k.setParentRowId(parentEntity.getRowId()); k.setParentRowId(parentEntity.getRowId());
}); });

2
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
View File

@ -48,6 +48,8 @@
<result column="convert_to_ebom_time" property="convertToEbomTime" jdbcType="TIMESTAMP"/> <result column="convert_to_ebom_time" property="convertToEbomTime" jdbcType="TIMESTAMP"/>
<result column="remark" property="remark" jdbcType="VARCHAR"/> <result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="dept_name" property="deptName" jdbcType="VARCHAR"/> <result column="dept_name" property="deptName" jdbcType="VARCHAR"/>
<result column="dept_row_id" property="deptRowId" jdbcType="BIGINT"/>
<result column="level_num" property="levelNum" jdbcType="INTEGER"/> <result column="level_num" property="levelNum" jdbcType="INTEGER"/>
<result column="change_desc" property="changeDesc" jdbcType="VARCHAR"/> <result column="change_desc" property="changeDesc" jdbcType="VARCHAR"/>
<result column="notice_nums" property="noticeNums" jdbcType="VARCHAR"/> <result column="notice_nums" property="noticeNums" jdbcType="VARCHAR"/>