diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java index c293a5b9..7ee774d1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java @@ -181,6 +181,11 @@ public class BomNewEbomChildEntity implements Serializable { @ApiModelProperty(value = "异常状态:1=正常、2=冻结/完全弃用异常、3=递归异常、4=数据不完整异常、5=超级物料异常、6=重复异常") private Integer exceptionStatus; + @TableField(value = "exception_tag") + @ApiModelProperty(value = "异常确认标记") + private String exceptionTag; + + /** * 来源1-原BOM转换 2-EXCE导入 3-MDM创建 */ @@ -214,6 +219,12 @@ public class BomNewEbomChildEntity implements Serializable { @ApiModelProperty("BOM-版本Row_id(parent表row_id 关联)") private Long bomVersionRowId; + + + + + + private static final long serialVersionUID = -14147430944632372L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java index 8c07d9a4..09902d71 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java @@ -324,6 +324,11 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty("生成虚拟包的跟节点物料编码") private String virtualPartRootMaterialNo; + + @ApiModelProperty(value = "异常确认标记") + private String exceptionTag; + + private List childNodes = Collections.emptyList(); private static final long serialVersionUID = 1L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index f71e77d9..6b34da33 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1248,6 +1248,7 @@ public class BomNewEbomParentService extends ServiceImpl + + @@ -39,7 +41,7 @@ row_id, parent_row_id, identity_no, order_number, drawing_no, material_no, material_name, material_desc, material_texture, material_unit, material_category_code, unit_weight, num, total_weight, project_type, project_type_input_type, created_by,virtual_part_is, created_time, modify_time, edit_status, exception_status, source, - source_row_id, remark,virtual_part_type,virtual_part_root_material_no,bom_version_row_id + source_row_id, remark,virtual_part_type,virtual_part_root_material_no,bom_version_row_id,exception_tag