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

Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom 

# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
This commit is contained in:
曹鹏飞 2024-05-09 08:35:50 +08:00
parent a03a1bb28d adf65265ba
commit 213f9a3277
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,6 +338,9 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
return (StrUtil.isBlank(getMaterialNo())?"":getMaterialNo())+(StrUtil.isBlank(getProjectType())?"":getProjectType()); return (StrUtil.isBlank(getMaterialNo())?"":getMaterialNo())+(StrUtil.isBlank(getProjectType())?"":getProjectType());
} }
@ApiModelProperty(value = "导入SAP状态")
private Integer sapState;
private List<BomNewEbomParentVO> childNodes = Collections.emptyList(); private List<BomNewEbomParentVO> childNodes = Collections.emptyList();
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

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

@ -263,6 +263,9 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable {
@ApiModelProperty("层级数字") @ApiModelProperty("层级数字")
private BigDecimal levelNumber; private BigDecimal levelNumber;
@ApiModelProperty(value = "导入SAP状态")
private Integer sapState;
private String levelNo; private String levelNo;