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 540ccb08..95c17800 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; - @TableField(value = "initial_parent_row_id") @ApiModelProperty(value = "刚转过来或刚导入时的父行ID") 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 c23ea246..093ce6f2 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,13 +385,6 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "导入SAP时间") private LocalDateTime sapTime; - /** - * SAP排序字符串 - */ - @TableField(value = "sap_order_num") - @ApiModelProperty(value = "SAP排序字符串") - private String sapOrderNum; - @TableField(exist = false) private boolean isImportRoot = false; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java index 894158c3..fa6e7df7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java @@ -24,7 +24,6 @@ import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.MaterialMainService; import com.nflg.product.bomnew.service.UserRoleService; import com.nflg.product.bomnew.service.cache.MaterialMateCache; -import com.nflg.product.bomnew.util.BomUtil; import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.VUtils; import com.nflg.product.bomnew.util.VersionUtil; @@ -388,8 +387,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { this.eBomParentResult.add(ebom); } eBomParent.setMaterialOriginalUnit(eBomParent.getMaterialUnit()); - eBomParent.setSapOrderNum(BomUtil.generateSapOrderNum(parentEnt.getProjectType(), parentEnt.getMaterialCategoryCode() - , "1010", parentEnt.getMaterialNo(), parentEnt.getBomExist())); this.eBomParentResult.add(eBomParent); return eBomParent.getRowId(); @@ -432,8 +429,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert { // } childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit()); childEntity.setInitialParentRowId(parent.getEBomRowId()); - childEntity.setSapOrderNum(BomUtil.generateSapOrderNum(childEntity.getProjectType() - , childEntity.getMaterialCategoryCode(), "1010", childEntity.getMaterialNo(), 0)); this.eBomChildResult.add(childEntity);