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

查询

This commit is contained in:
大米 2024-02-20 15:53:56 +08:00
parent 96702f5e35
commit f0a32b44ce
12 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildEntity.java
View File

@ -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;

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java
View File

@ -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;

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
View File

@ -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);

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java
View File

@ -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;

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -736,7 +736,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
bomTree.forEach(k->{
BomNewEbomChildEntity entChild=new BomNewEbomChildEntity();
entChild.setRowId(k.getRowId());
entChild.setBomRowId(k.getBomRowId());
entChild.setBomVersionRowId(k.getBomRowId());
bomChildren.add(entChild);
});
if(CollUtil.isNotEmpty(bomChildren)) {

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
View File

@ -520,7 +520,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
bomAllChildList.forEach(k->{
BomNewOriginalChildEntity entChild=new BomNewOriginalChildEntity();
entChild.setRowId(k.getRowId());
entChild.setBomRowId(k.getBomRowId());
entChild.setBomVersionRowId(k.getBomRowId());
originalChildEntities.add(entChild);
});
if(CollUtil.isNotEmpty(originalChildEntities)){

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
View File

@ -857,7 +857,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
allBom.forEach(k->{
BomNewPbomChildEntity entChild=new BomNewPbomChildEntity();
entChild.setRowId(k.getRowId());
entChild.setBomRowId(k.getBomRowId());
entChild.setBomVersionRowId(k.getBomRowId());
pBomChildren.add(entChild);
});
if(CollUtil.isNotEmpty(pBomChildren)){

12
nflg_project_dev/nflg-bom-new/src/main/resources/bootstrap-sit.properties
View File

@ -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

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml
View File

@ -31,7 +31,7 @@
<result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="virtual_part_type" property="virtualPartType" jdbcType="INTEGER"/>
<result column="virtual_part_root_material_no" property="virtualPartRootMaterialNo" />
<result column="bom_row_id" property="bomRowId" jdbcType="BIGINT" />
<result column="bom_version_row_id" property="bomVersionRowId" jdbcType="BIGINT" />
</resultMap>
<sql id="Base_Column_List">
@ -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
</sql>

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml
View File

@ -31,7 +31,7 @@
<result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="virtual_part_type" property="virtualPartType" jdbcType="INTEGER"/>
<result column="virtual_part_root_material_no" property="virtualPartRootMaterialNo" />
<result column="bom_row_id" property="bomRowId" jdbcType="BIGINT" />
<result column="bom_version_row_id" property="bomVersionRowId" jdbcType="BIGINT" />
</resultMap>
<sql id="Base_Column_List">
@ -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
</sql>

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
View File

@ -22,12 +22,12 @@
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="material_texture" property="materialTexture" jdbcType="VARCHAR"/>
<result column="should_bom_exist" property="shouldBomExist" jdbcType="INTEGER"/>
<result column="bom_row_id" property="bomRowId" jdbcType="BIGINT" />
<result column="bom_version_row_id" property="bomVersionRowId" jdbcType="BIGINT" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
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 </sql>
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 </sql>
<delete id="delOriginalChildNotInRowIds">

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml
View File

@ -34,12 +34,12 @@
<result column="source_parent_material_no" property="sourceParentMaterialNo" jdbcType="VARCHAR"/>
<result column="virtual_part_type" property="virtualPartType" jdbcType="INTEGER"/>
<result column="virtual_part_root_material_no" property="virtualPartRootMaterialNo"/>
<result column="bom_row_id" property="bomRowId" jdbcType="BIGINT" />
<result column="bom_version_row_id" property="bomVersionRowId" jdbcType="BIGINT" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
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 </sql>
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 </sql>
<delete id="delByRowId">