From 4dfef33691ede2576cb488d659651019f05690ff Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 16 Feb 2024 22:22:26 +0800 Subject: [PATCH] init --- .../master/BomNewEbomChildFormalMapper.java | 27 ++ .../master/BomNewEbomParentFormalMapper.java | 66 ++++ .../entity/BomNewEbomChildFormalEntity.java | 219 +++++++++++ .../entity/BomNewEbomParentFormalEntity.java | 356 ++++++++++++++++++ .../service/BomNewEbomChildFormalService.java | 19 + .../BomNewEbomParentFormalService.java | 61 +++ .../master/BomNewEbomChildFormalMapper.xml | 47 +++ .../master/BomNewEbomParentFormalMapper.xml | 65 ++++ 8 files changed, 860 insertions(+) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentFormalService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentFormalMapper.xml diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java new file mode 100644 index 00000000..a723b7d6 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java @@ -0,0 +1,27 @@ +package com.nflg.product.bomnew.mapper.master; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; +import com.nflg.product.bomnew.pojo.vo.ChildMaxExceptionStateVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * t_bom_new_ebom_child 表数据库访问层 + * + * + * @author makejava + * @since 2023-11-17 16:55:16 + */ +public interface BomNewEbomChildMapper extends BaseMapper { + + List getChildByMaterialNo(@Param("materialNo") String materialNo); + + /** + * 全量更新-EBOM物料use + */ + void updateEBomMaterialUse(); + + List getChildMaxExceptionState(@Param("bomRowIds") List bomRowIds); +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java new file mode 100644 index 00000000..ae6a654d --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java @@ -0,0 +1,66 @@ +package com.nflg.product.bomnew.mapper.master; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; +import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; +import com.nflg.product.bomnew.pojo.query.OriginalBomQuery; +import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; +import com.nflg.product.bomnew.pojo.vo.BomNewEbomUpgradeChangeVO; +import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; +import com.nflg.product.bomnew.pojo.vo.MaterialHistoryProjectTypeVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Set; + +/** + * t_bom_new_ebom_parent 表数据库访问层 + * + * + * @author makejava + * @since 2023-11-17 16:55:11 + */ +public interface BomNewEbomParentMapper extends BaseMapper { + + /** + * 获取EBom列表 + * @param page + * @param query + * @return + */ + Page getEBomListPage(Page page, @Param("query") BomNewEbomParentQuery query ,@Param("job") Integer job, @Param("createdBy") String createdBy); + + + /** + * 正式工作表 + * @param page + * @param query + * @return + */ + Page formalWorksheet(Page page, @Param("query") BomNewEbomParentQuery query); + + Page getUpgradeChangeList(Page page, @Param("query") BomNewEbomParentQuery query); + /** + * 获取子级 + * @param rowId + * @return + */ + List getParentChild(@Param("rowId") Long rowId); + + List getParentChildBatch(@Param("rowIds") List rowIds); + + MaterialHistoryProjectTypeVO getMaterialHistoryProjectType(@Param("materialNo")String materialNo); + + Set getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set list); + + List getParentForMaterialNoSeach(@Param("materialNoList") List materialNoList); + + List getChildForMaterialNoSeach(@Param("materialNoList") List materialNoList,@Param("materialNo") String materialNo); + + void updateRootState(); + + void delBatch(@Param("rowIds") List rowIds); + + void updateStateBatchByRowIds(@Param("status") Integer status, @Param("list") List list ); +} 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 new file mode 100644 index 00000000..f8c0588e --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java @@ -0,0 +1,219 @@ +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 + * + * @author makejava + * @since 2023-12-29 14:01:47 + */ +@Data +@Accessors(chain = true) +@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") + private Long parentRowId; + + /** + * 父级id_子级ID(原父节点ID) + */ + @TableField(value = "identity_no") + @ApiModelProperty(value = "父级id_子级ID(原父节点ID)") + private String identityNo; + + /** + * 排序号 + */ + @TableField(value = "order_number") + @ApiModelProperty(value = "排序号") + private String orderNumber; + + /** + * 图号 + */ + @TableField(value = "drawing_no") + @ApiModelProperty(value = "图号") + private String drawingNo; + + /** + * 物料编码 + */ + @TableField(value = "material_no") + @ApiModelProperty(value = "物料编码") + private String materialNo; + + /** + * 物料名称 + */ + @TableField(value = "material_name") + @ApiModelProperty(value = "物料名称") + private String materialName; + + /** + * 物料描述 + */ + @TableField(value = "material_desc") + @ApiModelProperty(value = "物料描述") + private String materialDesc; + + /** + * 材质 + */ + @TableField(value = "material_texture") + @ApiModelProperty(value = "材质") + private String materialTexture; + + /** + * 单位 + */ + @TableField(value = "material_unit") + @ApiModelProperty(value = "单位") + private String materialUnit; + + /** + * 物料分类编码 + */ + @TableField(value = "material_category_code") + @ApiModelProperty(value = "物料分类编码") + private String materialCategoryCode; + + /** + * 单重 + */ + @TableField(value = "unit_weight") + @ApiModelProperty(value = "单重") + private BigDecimal unitWeight; + + /** + * 数量 + */ + @TableField(value = "num") + @ApiModelProperty(value = "数量") + private BigDecimal num; + + /** + * 总重 + */ + @TableField(value = "total_weight") + @ApiModelProperty(value = "总重") + private BigDecimal totalWeight; + + /** + * 项目类别 + */ + @TableField(value = "project_type") + @ApiModelProperty(value = "项目类别") + private String projectType; + + /** + * 项目类别输入方式: 0-自动匹配 1-手工录入 2-来自物料主数据 3-来自历史统计 + */ + @TableField(value = "project_type_input_type") + @ApiModelProperty(value = "项目类别输入方式: 0-自动匹配 1-手工录入 2-来自物料主数据 3-来自历史统计") + private Integer projectTypeInputType; + + /** + * 创建人工号 + */ + @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 = "创建时间") + private LocalDateTime createdTime; + + /** + * 更新时间 + */ + @TableField(value = "modify_time") + @ApiModelProperty(value = "更新时间") + private LocalDateTime modifyTime; + + /** + * 处理状态：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=重复异常") + private Integer exceptionStatus; + + /** + * 来源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)") + private Long sourceRowId; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + @TableField(value = "virtual_part_type") + @ApiModelProperty(value = "0-非虚拟包 1-发货包 2-制作包 4-直发包 8-发货前装配包") + private Integer virtualPartType; + + @TableField(value = "virtual_part_root_material_no") + @ApiModelProperty(value = "生成虚拟包跟物料编码") + private String virtualPartRootMaterialNo; + + @TableField(value = "bom_row_id") + @ApiModelProperty("BOM-版本Row_id(parent表row_id 关联)") + private Long bomRowId; + + private static final long serialVersionUID = -14147430944632372L; + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java new file mode 100644 index 00000000..27d56f3e --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java @@ -0,0 +1,356 @@ +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_parent + * + * @author makejava + * @since 2023-12-29 14:00:31 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomParentEntity") +@TableName(value = "t_bom_new_ebom_parent") +public class BomNewEbomParentEntity implements Serializable { + + /** + * 主键行ID-雪花 + */ + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键行ID-雪花") + private Long rowId; + + /** + * 批号-来自plm-临时 + */ + @TableField(value = "batch_no") + @ApiModelProperty(value = "批号-来自plm-临时") + private String batchNo; + + /** + * 图号 + */ + @TableField(value = "drawing_no") + @ApiModelProperty(value = "图号") + private String drawingNo; + + /** + * 物料编码 + */ + @TableField(value = "material_no") + @ApiModelProperty(value = "物料编码") + private String materialNo; + + /** + * 排序号 + */ + @TableField(value = "order_number") + @ApiModelProperty(value = "排序号") + private String orderNumber; + + /** + * 物料名称 + */ + @TableField(value = "material_name") + @ApiModelProperty(value = "物料名称") + private String materialName; + + /** + * 物料描述 + */ + @TableField(value = "material_desc") + @ApiModelProperty(value = "物料描述") + private String materialDesc; + + /** + * 材质，材料 + */ + @TableField(value = "material_texture") + @ApiModelProperty(value = "材质，材料") + private String materialTexture; + + /** + * 单位 + */ + @TableField(value = "material_unit") + @ApiModelProperty(value = "单位") + private String materialUnit; + + /** + * 单重 + */ + @TableField(value = "unit_weight") + @ApiModelProperty(value = "单重") + private BigDecimal unitWeight; + + /** + * 总重 + */ + @TableField(value = "total_weight") + @ApiModelProperty(value = "总重") + private BigDecimal totalWeight; + + /** + * 版本号 + */ + @TableField(value = "current_version") + @ApiModelProperty(value = "版本号") + private String currentVersion; + + /** + * 数量 + */ + @TableField(value = "num") + @ApiModelProperty(value = "数量") + private BigDecimal num; + + /** + * 来源1-原BOM转换 2-EXCE导入 3-MDM创建 + */ + @TableField(value = "source") + @ApiModelProperty(value = "来源1-原BOM转换 2-EXCE导入 3-MDM创建") + private Integer source; + + /** + * 是否跟节点 0-否 1-是 + */ + @TableField(value = "root_is") + @ApiModelProperty(value = "是否跟节点 0-否 1-是") + private Integer rootIs; + + /** + * 是否应该有BOM 0-否 1-是 + */ + @TableField(value = "should_bom_exist") + @ApiModelProperty(value = "是否应该有BOM 0-否 1-是") + private Integer shouldBomExist; + + /** + * 超级物料 0-否 1-是 + */ + @TableField(value = "super_material_status") + @ApiModelProperty(value = "超级物料 0-否 1-是") + private Integer superMaterialStatus; + + /** + * 是否有BOM: 0-否 1-是 + */ + @TableField(value = "bom_exist") + @ApiModelProperty(value = "是否有BOM: 0-否 1-是") + private Integer bomExist; + + /** + * 是否最新版：0-否 1-是 + */ + @TableField(value = "last_version_is") + @ApiModelProperty(value = "是否最新版：0-否 1-是") + private Integer lastVersionIs; + + /** + * 1=待处理、2=已处理 + */ + @TableField(value = "edit_status") + @ApiModelProperty(value = "1=待处理、2=已处理") + private Integer editStatus; + + /** + * 1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM） + */ + @TableField(value = "status") + @ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）") + private Integer status; + + /** + * 是否用户跟节点 0-否 1-是 + */ + @TableField(value = "user_root_is") + @ApiModelProperty(value = "是否用户跟节点 0-否 1-是") + private Integer userRootIs; + + /** + * 已生成的虚拟包 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=初始状态 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(value = "是否虚拟包 0-否 1-是") + private Integer virtualPackageIs; + + /** + * 来源行ID(原始BOM中的行ID) + */ + @TableField(value = "source_row_id") + @ApiModelProperty(value = "来源行ID(原始BOM中的行ID)") + private Long sourceRowId; + + /** + * 设计人员编码 + */ + @TableField(value = "devise_user_code") + @ApiModelProperty(value = "设计人员编码") + private String deviseUserCode; + + /** + * 设计人员名称 + */ + @TableField(value = "devise_name") + @ApiModelProperty(value = "设计人员名称") + private String deviseName; + + /** + * 创建人编码 + */ + @TableField(value = "created_by") + @ApiModelProperty(value = "创建人编码") + private String createdBy; + + /** + * 创建时间 + */ + @TableField(value = "created_time") + @ApiModelProperty(value = "创建时间") + private LocalDateTime createdTime; + + /** + * 创建人员所属岗位 0-设计人员 1-工艺人员 2-其他 + */ + @TableField(value = "created_job") + @ApiModelProperty(value = "创建人员所属岗位 0-设计人员 1-工艺人员 2-其他") + private Integer createdJob; + + /** + * 复核时间 + */ + @TableField(value = "audit_time") + @ApiModelProperty(value = "复核时间") + private LocalDateTime auditTime; + + /** + * 复核人 + */ + @TableField(value = "audit_user_name") + @ApiModelProperty(value = "复核人") + private String auditUserName; + + /** + * 发布时间 + */ + @TableField(value = "release_time") + @ApiModelProperty(value = "发布时间") + private LocalDateTime releaseTime; + + /** + * 发布人 + */ + @TableField(value = "release_user_name") + @ApiModelProperty(value = "发布人") + private String releaseUserName; + + /** + * 退回时间 + */ + @TableField(value = "revert_time") + @ApiModelProperty(value = "退回时间") + private LocalDateTime revertTime; + + /** + * 退回人 + */ + @TableField(value = "revert_user_name") + @ApiModelProperty(value = "退回人") + private String revertUserName; + + /** + * 版本过期时间=下个版本的创建时间 + */ + @TableField(value = "expire_end_time") + @ApiModelProperty(value = "版本过期时间=下个版本的创建时间") + private LocalDateTime expireEndTime; + + /** + * 转换pbom时间 + */ + @TableField(value = "convert_to_ebom_time") + @ApiModelProperty(value = "转换pbom时间") + private LocalDateTime convertToEbomTime; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 设计维护部门名称 + */ + @TableField(value = "dept_name") + @ApiModelProperty(value = "设计维护部门名称") + private String deptName; + + /** + * bom树的高度 + */ + @TableField(value = "level_num") + @ApiModelProperty(value = "bom树的高度") + private Integer levelNum; + + /** + * 升版说明 + */ + @TableField(value = "change_desc") + @ApiModelProperty(value = "升版说明") + private String changeDesc; + + /** + * 通知单号 + */ + @TableField(value = "notice_nums") + @ApiModelProperty(value = "通知单号") + private String noticeNums; + + /** + * 修改时间 + */ + @TableField(value = "modify_time") + @ApiModelProperty(value = "修改时间") + private LocalDateTime modifyTime; + + private static final long serialVersionUID = 265246823929418418L; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java new file mode 100644 index 00000000..4e6741ee --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java @@ -0,0 +1,19 @@ +package com.nflg.product.bomnew.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.product.bomnew.mapper.master.BomNewEbomChildMapper; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; +import org.springframework.stereotype.Service; + + +/** + * t_bom_new_ebom_child 表服务实现类 + * + * + * @author makejava + * @since 2023-11-17 16:55:16 + */ +@Service +public class BomNewEbomChildService extends ServiceImpl { + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentFormalService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentFormalService.java new file mode 100644 index 00000000..bf1d333e --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentFormalService.java @@ -0,0 +1,61 @@ +package com.nflg.product.bomnew.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.TypeReference; +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; +import com.nflg.product.base.core.conmon.util.SessionUtil; +import com.nflg.product.base.core.exception.NflgBusinessException; +import com.nflg.product.bomnew.constant.*; +import com.nflg.product.bomnew.mapper.master.BomNewEbomParentFormalMapper; +import com.nflg.product.bomnew.mapper.master.BomNewEbomParentMapper; +import com.nflg.product.bomnew.pojo.dto.*; +import com.nflg.product.bomnew.pojo.entity.*; +import com.nflg.product.bomnew.pojo.query.BomNewEbomMaterialQuery; +import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; +import com.nflg.product.bomnew.pojo.vo.*; +import com.nflg.product.bomnew.service.domain.EBom.*; +import com.nflg.product.bomnew.util.*; +import lombok.extern.slf4j.Slf4j; +import nflg.product.common.constant.STATE; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.ttzero.excel.entity.ListSheet; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinTask; +import java.util.stream.Collectors; + + + +@Service +@Slf4j +public class BomNewEbomParentFormalService extends ServiceImpl { + + + + +} 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 new file mode 100644 index 00000000..eddd9aab --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildFormalMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentFormalMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentFormalMapper.xml new file mode 100644 index 00000000..1e7ebc9c --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentFormalMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, + 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, + revert_time, revert_user_name, expire_end_time, convert_to_ebom_time, remark, dept_name, level_num, change_desc, + notice_nums, modify_time + + +