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 b13f10cd..ce71b1ad 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 @@ -224,13 +224,6 @@ public class BomNewEbomChildEntity implements Serializable { @ApiModelProperty(value = "原始单位-来自cad") private String materialOriginalUnit; - /** - * SAP排序字符串 - */ - @TableField(value = "sap_order_num") - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum; - // private String materialNoAndProjectType; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java index c57d875b..7223ff50 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java @@ -385,12 +385,5 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "导入SAP时间") private LocalDateTime sapTime; - /** - * SAP排序字符串 - */ - @TableField(value = "sap_order_num") - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum; - private static final long serialVersionUID = 265246823929418418L; } 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 a4a6b4a9..a0d160ee 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 @@ -345,7 +345,7 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { * SAP排序字符串 */ @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum; + private String sapOrderNum = "0040"; private List childNodes = Collections.emptyList(); 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 1c1bebc2..6fd59f88 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 @@ -414,6 +414,8 @@ public class BomNewEbomParentService extends ServiceImpl