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 f8c0588e..c293a5b9 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 @@ -210,9 +210,9 @@ public class BomNewEbomChildEntity implements Serializable { @ApiModelProperty(value = "生成虚拟包跟物料编码") private String virtualPartRootMaterialNo; - @TableField(value = "bom_row_id") + @TableField(value = "bom_version_row_id") @ApiModelProperty("BOM-版本Row_id(parent表row_id 关联)") - private Long bomRowId; + 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/entity/BomNewEbomChildFormalEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java index b8fa1ba9..ce351e0f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java @@ -207,9 +207,9 @@ public class BomNewEbomChildFormalEntity implements Serializable { @ApiModelProperty(value = "生成虚拟包跟物料编码") private String virtualPartRootMaterialNo; - @TableField(value = "bom_row_id") + @TableField(value = "bom_version_row_id") @ApiModelProperty("BOM-版本Row_id(parent表row_id 关联)") - private Long bomRowId; + private Long bomVersionRowId; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java index ffa488e2..d2fd6cbc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java @@ -131,9 +131,9 @@ public class BomNewOriginalChildEntity implements Serializable { @ApiModelProperty("是否应该有BOM 0-否 1-是") private Integer shouldBomExist; - @TableField(value = "bom_row_id") + @TableField(value = "bom_version_row_id") @ApiModelProperty("BOM-版本Row_id(parent表row_id 关联)") - private Long bomRowId; + private Long bomVersionRowId; public BigDecimal getTotalWeight() { return NumberUtil.mul(this.getUnitWeight(), this.num); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java index fd0ef11c..12c635d1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java @@ -228,9 +228,9 @@ public class BomNewPbomChildEntity implements Serializable { private String virtualPartRootMaterialNo; - @TableField(value = "bom_row_id") + @TableField(value = "bom_version_row_id") @ApiModelProperty("BOM-版本rowId(parent表rowId关联)") - private Long bomRowId; + private Long bomVersionRowId; private static final long serialVersionUID = -76633783850936076L; 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 03ecfaad..6097953c 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 @@ -736,7 +736,7 @@ public class BomNewEbomParentService extends ServiceImpl{ BomNewEbomChildEntity entChild=new BomNewEbomChildEntity(); entChild.setRowId(k.getRowId()); - entChild.setBomRowId(k.getBomRowId()); + entChild.setBomVersionRowId(k.getBomRowId()); bomChildren.add(entChild); }); if(CollUtil.isNotEmpty(bomChildren)) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 803cd317..e68dbf4d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -520,7 +520,7 @@ public class BomNewOriginalParentService extends ServiceImpl{ BomNewOriginalChildEntity entChild=new BomNewOriginalChildEntity(); entChild.setRowId(k.getRowId()); - entChild.setBomRowId(k.getBomRowId()); + entChild.setBomVersionRowId(k.getBomRowId()); originalChildEntities.add(entChild); }); if(CollUtil.isNotEmpty(originalChildEntities)){ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 0d725509..d45a16a1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -857,7 +857,7 @@ public class BomNewPbomParentService extends ServiceImpl{ BomNewPbomChildEntity entChild=new BomNewPbomChildEntity(); entChild.setRowId(k.getRowId()); - entChild.setBomRowId(k.getBomRowId()); + entChild.setBomVersionRowId(k.getBomRowId()); pBomChildren.add(entChild); }); if(CollUtil.isNotEmpty(pBomChildren)){ diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties index 74ba7641..b46979c2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties @@ -2,3 +2,15 @@ nacos.server-addr=192.168.0.194:8848 +spring.redis.database=0 +spring.redis.host=192.168.0.194 +spring.redis.password= +spring.redis.port=6379 +spring.redis.timeout=0 +spring.redis.ssl=false +spring.redis.lettuce.pool.max-wait=1ms +spring.redis.lettuce.pool.max-active=8 +spring.redis.lettuce.pool.max-idle=8 +spring.redis.lettuce.pool.min-idle=0 + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml index eddd9aab..9fd1ff65 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml @@ -31,7 +31,7 @@ - + @@ -39,7 +39,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_row_id + source_row_id, remark,virtual_part_type,virtual_part_root_material_no,bom_version_row_id diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml index 510ca57c..ba743099 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml @@ -31,7 +31,7 @@ - + @@ -39,7 +39,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_row_id + source_row_id, remark,virtual_part_type,virtual_part_root_material_no,bom_version_row_id diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml index 60abf715..fc203870 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml @@ -22,12 +22,12 @@ - + - row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by,created_time ,edit_status ,material_texture ,should_bom_exist ,bom_row_id + row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by,created_time ,edit_status ,material_texture ,should_bom_exist ,bom_version_row_id diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml index 4442d6dc..a329b790 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml @@ -34,12 +34,12 @@ - + - row_id, parent_row_id, identity_no, fac_code, order_number, drawing_no, material_no, material_name, material_desc, material_texture, material_unit, material_category_code, unit_weight, num, total_weight, project_type, production_factory_code,production_factory_code_input_type, set_production_factory_time, super_material_status, virtual_part_is, created_by, created_time, modify_time, source_row_id, remark, source_parent_material_no ,virtual_part_type ,virtual_part_root_material_no ,bom_row_id + row_id, parent_row_id, identity_no, fac_code, order_number, drawing_no, material_no, material_name, material_desc, material_texture, material_unit, material_category_code, unit_weight, num, total_weight, project_type, production_factory_code,production_factory_code_input_type, set_production_factory_time, super_material_status, virtual_part_is, created_by, created_time, modify_time, source_row_id, remark, source_parent_material_no ,virtual_part_type ,virtual_part_root_material_no ,bom_version_row_id