From f92674a64bc70e3da6ff9c469e0f7712afda6efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 29 Dec 2023 14:18:00 +0800 Subject: [PATCH] =?UTF-8?q?1.ebom=5Fparent=20=E5=8E=BB=E6=8E=89=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/entity/BomNewEbomChildEntity.java | 166 ++++++++++-------- .../pojo/entity/BomNewEbomParentEntity.java | 63 +++---- .../bomnew/pojo/vo/BomNewEbomParentVO.java | 3 + .../service/BomNewEbomParentService.java | 24 +-- .../mapper/master/BomNewEbomChildMapper.xml | 3 +- .../mapper/master/BomNewEbomParentMapper.xml | 60 +++---- 6 files changed, 161 insertions(+), 158 deletions(-) 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 9e992724..6e98d730 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 @@ -2,196 +2,206 @@ package com.nflg.product.bomnew.pojo.entity; import java.math.BigDecimal; import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.io.Serializable; + import lombok.Data; import lombok.experimental.Accessors; + import java.time.LocalDateTime; import java.time.LocalDate; /** - * t_bom_new_ebom_child - * + * t_bom_new_ebom_child * * @author makejava - * @since 2023-12-14 11:50:34 + * @since 2023-12-29 14:01:47 */ @Data @Accessors(chain = true) -@ApiModel(value="com-nflg-product-bomnew-pojo-new-entity-BomNewEbomChildEntity") +@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomChildEntity") @TableName(value = "t_bom_new_ebom_child") public class BomNewEbomChildEntity implements Serializable { - + /** * 主键-雪花 */ @TableId(value = "row_id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键-雪花") private Long rowId; - + /** * 父行ID */ - @TableField(value = "parent_row_id") - @ApiModelProperty(value = "父行ID") + @TableField(value = "parent_row_id") + @ApiModelProperty(value = "父行ID") private Long parentRowId; - + /** * 父级id_子级ID(原父节点ID) */ - @TableField(value = "identity_no") - @ApiModelProperty(value = "父级id_子级ID(原父节点ID)") + @TableField(value = "identity_no") + @ApiModelProperty(value = "父级id_子级ID(原父节点ID)") private String identityNo; - + /** * 排序号 */ - @TableField(value = "order_number") - @ApiModelProperty(value = "排序号") + @TableField(value = "order_number") + @ApiModelProperty(value = "排序号") private String orderNumber; - + /** * 图号 */ - @TableField(value = "drawing_no") - @ApiModelProperty(value = "图号") + @TableField(value = "drawing_no") + @ApiModelProperty(value = "图号") private String drawingNo; - + /** * 物料编码 */ - @TableField(value = "material_no") - @ApiModelProperty(value = "物料编码") + @TableField(value = "material_no") + @ApiModelProperty(value = "物料编码") private String materialNo; - + /** * 物料名称 */ - @TableField(value = "material_name") - @ApiModelProperty(value = "物料名称") + @TableField(value = "material_name") + @ApiModelProperty(value = "物料名称") private String materialName; - + /** * 物料描述 */ - @TableField(value = "material_desc") - @ApiModelProperty(value = "物料描述") + @TableField(value = "material_desc") + @ApiModelProperty(value = "物料描述") private String materialDesc; - + /** * 材质 */ - @TableField(value = "material_texture") - @ApiModelProperty(value = "材质") + @TableField(value = "material_texture") + @ApiModelProperty(value = "材质") private String materialTexture; - + /** * 单位 */ - @TableField(value = "material_unit") - @ApiModelProperty(value = "单位") + @TableField(value = "material_unit") + @ApiModelProperty(value = "单位") private String materialUnit; - + /** * 物料分类编码 */ - @TableField(value = "material_category_code") - @ApiModelProperty(value = "物料分类编码") + @TableField(value = "material_category_code") + @ApiModelProperty(value = "物料分类编码") private String materialCategoryCode; - + /** * 单重 */ - @TableField(value = "unit_weight") - @ApiModelProperty(value = "单重") + @TableField(value = "unit_weight") + @ApiModelProperty(value = "单重") private BigDecimal unitWeight; - + /** * 数量 */ - @TableField(value = "num") - @ApiModelProperty(value = "数量") + @TableField(value = "num") + @ApiModelProperty(value = "数量") private BigDecimal num; - + /** * 总重 */ - @TableField(value = "total_weight") - @ApiModelProperty(value = "总重") + @TableField(value = "total_weight") + @ApiModelProperty(value = "总重") private BigDecimal totalWeight; - + /** * 项目类别 */ - @TableField(value = "project_type") - @ApiModelProperty(value = "项目类别") + @TableField(value = "project_type") + @ApiModelProperty(value = "项目类别") private String projectType; - + /** - * 项目类别输入方式: 0-自动匹配 1-手工录入 3-来自物料主数据 4-来自历史统计 + * 项目类别输入方式: 0-自动匹配 1-手工录入 2-来自物料主数据 3-来自历史统计 */ - @TableField(value = "project_type_input_type") - @ApiModelProperty(value = "项目类别输入方式: 0-自动匹配 1-手工录入 3-来自物料主数据 4-来自历史统计") + @TableField(value = "project_type_input_type") + @ApiModelProperty(value = "项目类别输入方式: 0-自动匹配 1-手工录入 2-来自物料主数据 3-来自历史统计") private Integer projectTypeInputType; - + /** * 创建人工号 */ - @TableField(value = "created_by") - @ApiModelProperty(value = "创建人工号") + @TableField(value = "created_by") + @ApiModelProperty(value = "创建人工号") private String createdBy; - + + /** + * 是否虚拟件 0-否 1-是 + */ + @TableField(value = "virtual_part_is") + @ApiModelProperty(value = "是否虚拟件 0-否 1-是") + private Integer virtualPartIs; + /** * 创建时间 */ - @TableField(value = "created_time") - @ApiModelProperty(value = "创建时间") + @TableField(value = "created_time") + @ApiModelProperty(value = "创建时间") private LocalDateTime createdTime; - + /** * 更新时间 */ - @TableField(value = "modify_time") - @ApiModelProperty(value = "更新时间") + @TableField(value = "modify_time") + @ApiModelProperty(value = "更新时间") private LocalDateTime modifyTime; - + /** * 处理状态：1=待处理、2=已处理 */ - @TableField(value = "edit_status") - @ApiModelProperty(value = "处理状态：1=待处理、2=已处理") + @TableField(value = "edit_status") + @ApiModelProperty(value = "处理状态：1=待处理、2=已处理") private Integer editStatus; - + /** * 异常状态：1=正常、2=冻结/完全弃用异常、3=递归异常、4=数据不完整异常、5=超级物料异常、6=重复异常 */ - @TableField(value = "exception_status") - @ApiModelProperty(value = "异常状态：1=正常、2=冻结/完全弃用异常、3=递归异常、4=数据不完整异常、5=超级物料异常、6=重复异常") + @TableField(value = "exception_status") + @ApiModelProperty(value = "异常状态：1=正常、2=冻结/完全弃用异常、3=递归异常、4=数据不完整异常、5=超级物料异常、6=重复异常") private Integer exceptionStatus; - + /** * 来源1-原BOM转换 2-EXCE导入 3-MDM创建 */ - @TableField(value = "source") - @ApiModelProperty(value = "来源1-原BOM转换 2-EXCE导入 3-MDM创建") + @TableField(value = "source") + @ApiModelProperty(value = "来源1-原BOM转换 2-EXCE导入 3-MDM创建") private Integer source; - + /** * 来源行ID(原始BOM中的行ID) */ - @TableField(value = "source_row_id") - @ApiModelProperty(value = "来源行ID(原始BOM中的行ID)") + @TableField(value = "source_row_id") + @ApiModelProperty(value = "来源行ID(原始BOM中的行ID)") private Long sourceRowId; - + /** * 备注 */ - @TableField(value = "remark") - @ApiModelProperty(value = "备注") + @TableField(value = "remark") + @ApiModelProperty(value = "备注") private String remark; - - private static final long serialVersionUID = 556727442146359439L; - + + private static final long serialVersionUID = -14147430944632372L; + } 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 c6e642b7..27d56f3e 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 @@ -1,23 +1,25 @@ package com.nflg.product.bomnew.pojo.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; + import lombok.Data; import lombok.experimental.Accessors; -import java.io.Serializable; -import java.math.BigDecimal; import java.time.LocalDateTime; +import java.time.LocalDate; /** * t_bom_new_ebom_parent * * @author makejava - * @since 2023-12-14 10:49:34 + * @since 2023-12-29 14:00:31 */ @Data @Accessors(chain = true) @@ -123,20 +125,6 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "来源1-原BOM转换 2-EXCE导入 3-MDM创建") private Integer source; - /** - * 项目类别 - */ - @TableField(value = "project_type") - @ApiModelProperty(value = "项目类别") - private String projectType; - - /** - * 项目类别输入方式: 0-自动匹配 1-手工录入 3-来自物料主数据 4-来自历史统计 - */ - @TableField(value = "project_type_input_type") - @ApiModelProperty(value = "项目类别输入方式: 0-自动匹配 1-手工录入 3-来自物料主数据 4-来自历史统计") - private Integer projectTypeInputType; - /** * 是否跟节点 0-否 1-是 */ @@ -144,10 +132,6 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "是否跟节点 0-否 1-是") private Integer rootIs; - @TableField(value = "virtrual_package_enum") - @ApiModelProperty("已生成的虚拟包 0-无 1-发货包 2-制作包 4-直发包 8-发货前装配包") - private Integer virtrualPackageEnum; - /** * 是否应该有BOM 0-否 1-是 */ @@ -198,14 +182,34 @@ public class BomNewEbomParentEntity implements Serializable { private Integer userRootIs; /** - * 异常状态：1=正常、2=冻结/完全弃用异常、3=递归异常、4=数据不完整异常、5=超级物料异常、6=重复异常 + * 已生成的虚拟包 0-无 1-发货包 2-制作包 4-直发包 8-发货前装配包 + */ + @TableField(value = "virtrual_package_enum") + @ApiModelProperty(value = "已生成的虚拟包 0-无 1-发货包 2-制作包 4-直发包 8-发货前装配包") + private Integer virtrualPackageEnum; + + /** + * -1=初始状态 1=正常 2=冻结/完全弃用异常：物料的状态冻结或者完全弃用的状态 3=递归异常：出现子级包含父级的异常情况（打在子级物料中的那个父级物料编码）4=数据不完整异常：物料编号或数量没有填写 5=超级物料异常：超级物料待说明 6=重复异常：当前层级包含了相同的物料信息 + * 7=物料主数据不存在：当前的物料信息在主数据平台不存在 8=项目类别为空 + * 9=项目赋值异常：当父级物料的项目类型为Q时，子级中不能存在项目类别为Q的物料 + *

+ * 10=项目赋值异常：当父级物料的项目类型为F时，子级中不能存在项目类型为F的物料 + *

+ * 11=未填写变更原因和技术通知单 + *

+ * 12=数量需要用户确认 + *

+ * 13=项目类型需要用户确认 */ @TableField(value = "exception_status") - @ApiModelProperty(value = "异常状态：1=正常、2=冻结/完全弃用异常、3=递归异常、4=数据不完整异常、5=超级物料异常、6=重复异常") + @ApiModelProperty(value = "-1=初始状态 1=正常 2=冻结/完全弃用异常：物料的状态冻结或者完全弃用的状态 3=递归异常：出现子级包含父级的异常情况（打在子级物料中的那个父级物料编码）4=数据不完整异常：物料编号或数量没有填写 5=超级物料异常：超级物料待说明 6=重复异常：当前层级包含了相同的物料信息 7= 物料主数据不存在：当前的物料信息在主数据平台不存在 8=项目类别为空 9=项目赋值异常：当父级物料的项目类型为Q时，子级中不能存在项目类别为Q的物料 10=项目赋值异常：当父级物料的项目类型为F时，子级中不能存在项目类型为F的物料 11=未填写变更原因和技术通知单 12=数量需要用户确认 13=项目类型需要用户确认") private Integer exceptionStatus; + /** + * 是否虚拟包 0-否 1-是 + */ @TableField(value = "virtual_package_is") - @ApiModelProperty("是否虚拟包 0-否 1-是") + @ApiModelProperty(value = "是否虚拟包 0-否 1-是") private Integer virtualPackageIs; /** @@ -348,6 +352,5 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "修改时间") private LocalDateTime modifyTime; - private static final long serialVersionUID = -84596616775263436L; - + 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 dd41aee0..5be22334 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 @@ -284,6 +284,9 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { + @ApiModelProperty("是否虚拟件") + private Integer virtualPartIs; + 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 707528c9..1aa8cb5f 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 @@ -353,17 +353,7 @@ public class BomNewEbomParentService extends ServiceImpl allList = task.getAllChild(); List parentResult = allList.stream().filter(u -> u.getParentRowId() > 0 && StrUtil.isNotBlank(u.getProjectType())).collect(Collectors.toList()); - List parents = new ArrayList<>(); List child = new ArrayList<>(); - parentResult.forEach(u -> { - BomNewEbomParentEntity parentEntity = new BomNewEbomParentEntity(); - parentEntity.setRowId(u.getParentRowId()); - parentEntity.setProjectType(u.getProjectType()); - parentEntity.setProjectTypeInputType(u.getProjectTypeInputType()); - parents.add(parentEntity); - }); - - List childntResult = allList.stream().filter(u -> u.getBomRowId() > 0 && StrUtil.isNotBlank(u.getProjectType())).collect(Collectors.toList()); parentResult.forEach(u -> { BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity(); childEntity.setRowId(u.getRowId()); @@ -371,9 +361,7 @@ public class BomNewEbomParentService extends ServiceImpl parentUpdate = new UpdateWrapper<>(); - parentUpdate.lambda() - .set(BomNewEbomParentEntity::getProjectType, dto.getProjectType()) - .set(BomNewEbomParentEntity::getModifyTime, LocalDateTime.now()) - .set(BomNewEbomParentEntity::getProjectTypeInputType, ProjectTypeInputTypeEnum.MANUAL_INPUT.getValue()) - .in(BomNewEbomParentEntity::getRowId, bomRowIdList); +// parentUpdate.lambda() +// .set(BomNewEbomParentEntity::getProjectType, dto.getProjectType()) +// .set(BomNewEbomParentEntity::getModifyTime, LocalDateTime.now()) +// .set(BomNewEbomParentEntity::getProjectTypeInputType, ProjectTypeInputTypeEnum.MANUAL_INPUT.getValue()) +// .in(BomNewEbomParentEntity::getRowId, bomRowIdList); this.update(parentUpdate); } 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 1ba9b004..c1dddac3 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 @@ -21,6 +21,7 @@ + @@ -34,7 +35,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, created_time, modify_time, edit_status, exception_status, source, + project_type_input_type, created_by,virtual_part_is, created_time, modify_time, edit_status, exception_status, source, source_row_id, remark diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index fadc8450..b68350f3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -18,8 +18,6 @@ - - @@ -56,7 +54,7 @@ row_id, batch_no, drawing_no, material_no, order_number, material_name, material_desc, material_texture, - material_unit, unit_weight, total_weight, current_version, num, source, project_type, project_type_input_type, + material_unit, unit_weight, total_weight, current_version, num, source, root_is,virtrual_package_enum, should_bom_exist, super_material_status, bom_exist, last_version_is, edit_status, status, user_root_is, exception_status,virtual_package_is, source_row_id, devise_user_code, devise_name, created_by, created_time, created_job, audit_time, audit_user_name, release_time, release_user_name, @@ -82,26 +80,23 @@ @@ -140,7 +136,7 @@ @@ -172,36 +168,41 @@ - update t_bom_new_ebom_parent set root_is=0,user_root_is=0 where last_version_is=1; - update t_bom_new_ebom_parent a join ( - select a.row_id from t_bom_new_ebom_parent a + update t_bom_new_ebom_parent + set root_is=0, + user_root_is=0 + where last_version_is = 1; + update t_bom_new_ebom_parent a join ( + select a.row_id from t_bom_new_ebom_parent a left join t_bom_new_ebom_child b on a.material_no=b.material_no - where a.last_version_is=1 and b.row_id is null ) t on a.row_id=t.row_id set a.root_is=1; + where a.last_version_is=1 and b.row_id is null ) t + on a.row_id=t.row_id set a.root_is=1; - update t_bom_new_ebom_parent a join ( - select a.row_id from t_bom_new_ebom_parent a + update t_bom_new_ebom_parent a join ( + select a.row_id from t_bom_new_ebom_parent a left join t_bom_new_ebom_child b - on a.material_no=b.material_no and a.created_by=b.created_by - where a.last_version_is=1 and b.row_id is null ) t on a.row_id=t.row_id set a.user_root_is=1; + on a.material_no=b.material_no and a.created_by=b.created_by + where a.last_version_is=1 and b.row_id is null ) t + on a.row_id=t.row_id set a.user_root_is=1; - - delete from t_bom_new_ebom_parent where row_id in + delete from t_bom_new_ebom_parent where row_id in #{rowId} ; - delete from t_bom_new_ebom_child where parent_row_id in + delete from t_bom_new_ebom_child where parent_row_id in #{rowId} ; @@ -213,7 +214,4 @@ #{item} - - -