From 26831d55d3fc2a4b716f72bbe124f3c498f472b5 Mon Sep 17 00:00:00 2001 From: jing's Date: Sun, 21 Jan 2024 21:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=A0=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/constant/MBomConstantEnum.java | 2 +- .../OptionalEbomImportChildHistoryMapper.java | 24 +++ .../OptionalEbomImportHistoryMapper.java | 19 ++ .../master/OptionalEbomMainHistoryMapper.java | 20 ++ .../pojo/entity/OptionalEbomConfigEntity.java | 7 + .../OptionalEbomImportChildHistoryEntity.java | 132 +++++++++++++ .../OptionalEbomImportHistoryEntity.java | 70 +++++++ .../pojo/entity/OptionalEbomMainEntity.java | 5 + .../entity/OptionalEbomMainHistoryEntity.java | 127 ++++++++++++ .../bomnew/pojo/vo/BomNewMbomMiddleVO.java | 22 +++ .../bomnew/pojo/vo/OptionalEbomConfigVO.java | 6 + .../pojo/vo/OptionalEbomImportChildVO.java | 2 +- .../bomnew/pojo/vo/OptionalEbomImportVO.java | 2 +- .../bomnew/pojo/vo/OptionalEbomMainVO.java | 3 +- .../service/BomNewEbomParentService.java | 11 +- .../service/OptionalEbomConfigService.java | 3 +- ...OptionalEbomImportChildHistoryService.java | 42 ++++ .../OptionalEbomImportChildService.java | 24 ++- .../OptionalEbomImportHistoryService.java | 27 +++ .../OptionalEbomMainHistoryService.java | 88 +++++++++ .../service/OptionalEbomMainService.java | 7 +- .../service/OptionalMbomMaterialService.java | 7 + .../aggreg/AggregOptionConfigService.java | 30 ++- .../service/aggreg/OptionalExcelService.java | 17 +- .../OptionalEBom/ConvertToMainHistory.java | 183 ++++++++++++++++++ .../master/OptionalEbomConfigMapper.xml | 12 +- .../OptionalEbomImportChildHistoryMapper.xml | 29 +++ .../OptionalEbomImportHistoryMapper.xml | 22 +++ .../master/OptionalEbomMainHistoryMapper.xml | 27 +++ .../mapper/master/OptionalEbomMainMapper.xml | 4 +- 30 files changed, 950 insertions(+), 24 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportChildHistoryMapper.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportHistoryMapper.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainHistoryMapper.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportChildHistoryEntity.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportHistoryEntity.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainHistoryEntity.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildHistoryService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportHistoryService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainHistoryService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalEBom/ConvertToMainHistory.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildHistoryMapper.xml create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportHistoryMapper.xml create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainHistoryMapper.xml diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/MBomConstantEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/MBomConstantEnum.java index e3e85a04..49a136aa 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/MBomConstantEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/MBomConstantEnum.java @@ -13,7 +13,7 @@ public class MBomConstantEnum { //1、待发布（sap）、3=已发布 UNPUB_SAP(1, "未发布"), - PUB_SAP(3, "已发布"); + PUB_SAP(3, "已导入"); private final Integer value; private final String description; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportChildHistoryMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportChildHistoryMapper.java new file mode 100644 index 00000000..e7f602da --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportChildHistoryMapper.java @@ -0,0 +1,24 @@ +package com.nflg.product.bomnew.mapper.master; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildHistoryEntity; +import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * ebom选配件 + * + + */ +@Mapper +public interface OptionalEbomImportChildHistoryMapper extends BaseMapper { + + +} + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportHistoryMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportHistoryMapper.java new file mode 100644 index 00000000..659168f5 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomImportHistoryMapper.java @@ -0,0 +1,19 @@ +package com.nflg.product.bomnew.mapper.master; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportHistoryEntity; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +public interface OptionalEbomImportHistoryMapper extends BaseMapper { + + + + +} + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainHistoryMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainHistoryMapper.java new file mode 100644 index 00000000..6de2ea66 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomMainHistoryMapper.java @@ -0,0 +1,20 @@ +package com.nflg.product.bomnew.mapper.master; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainHistoryEntity; +import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +public interface OptionalEbomMainHistoryMapper extends BaseMapper { + + +} + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java index d9493707..f813e916 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java @@ -62,6 +62,13 @@ public class OptionalEbomConfigEntity implements Serializable { @TableField(value = "edit_status") @ApiModelProperty(value = "状态(0 暂存 1发布)") private Integer editStatus; + + @TableField(value = "current_version") + @ApiModelProperty(value = "版本") + private Integer currentVersion; + + + /** * 是否导入sap(0 :否 1: 是) */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportChildHistoryEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportChildHistoryEntity.java new file mode 100644 index 00000000..9e5120cf --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportChildHistoryEntity.java @@ -0,0 +1,132 @@ +package com.nflg.product.bomnew.pojo.entity; + + +import cn.hutool.core.date.DateUtil; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@ApiModel("ebom选配件表") +@Accessors(chain = true) +@TableName(value = "t_optional_ebom_import_child_history") +public class OptionalEbomImportChildHistoryEntity 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 + */ + @TableField(value = "root_row_id") + @ApiModelProperty(value = "根节点id") + private Long rootRowId; + /** + * 物料编码 + */ + @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 = "drawing_no") + @ApiModelProperty(value = "图号") + private String drawingNo; + /** + * 部件类型(1 单选 2 多选) + */ + @TableField(value = "part_type") + @ApiModelProperty(value = "部件类型(1 单选 2 多选)") + private Integer partType; + /** + * 是否显示(0不显示 1显示) + */ + @TableField(value = "is_enable") + @ApiModelProperty(value = "是否显示(0不显示 1显示)") + private Integer isEnable; + /** + * 是否标配(0 否 1是) + */ + @TableField(value = "choose_status") + @ApiModelProperty(value = "是否标配(0 否 1是)") + private Integer chooseStatus; + /** + * 备注 + */ + @TableField(value = "remak") + @ApiModelProperty(value = "备注") + private String remak; + /** + * 数据来源 (0 :excel 1:手动录入) + */ + @TableField(value = "source") + @ApiModelProperty(value = "数据来源 (0 :excel 1:手动录入)") + private Integer source; + /** + * 是否删除(0 :否 1：是) + */ + @TableField(value = "is_del") + @ApiModelProperty(value = "是否删除(0 :否 1：是)") + private Integer isDel; + /** + * 创建时间 + */ + @TableField(value = "created_time") + @ApiModelProperty(value = "创建时间") + private String createdTime; + + + + + + @TableField(value = "updated_time") + @ApiModelProperty(value = "更新时间") + private String updatedTime; + + public String getUpdatedTime(){ + + return DateUtil.now(); + + } + + + /** + * 操作人编码 + */ + @TableField(value = "created_by") + @ApiModelProperty(value = "操作人编码") + private String createdBy; + + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportHistoryEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportHistoryEntity.java new file mode 100644 index 00000000..b51c6671 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomImportHistoryEntity.java @@ -0,0 +1,70 @@ +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@ApiModel("选项信息") +@Accessors(chain = true) +@TableName(value = "t_optional_ebom_import_history") +public class OptionalEbomImportHistoryEntity implements Serializable { + + /** + * 主键 + */ + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private Long rowId; + + + /** + * 根节点id + */ + @TableField(value = "root_row_id") + @ApiModelProperty(value = "根节点id") + private Long rootRowId; + /** + * 上层id + */ + @TableField(value = "parent_row_id") + @ApiModelProperty(value = "上层id") + private Long parentRowId; + /** + * 选项名 + */ + @TableField(value = "option_name") + @ApiModelProperty(value = "选项名") + private String optionName; + + @TableField(value = "option_drawing_no") + @ApiModelProperty(value = "选项图号") + private String optionDrawingNo; + /** + * 创建时间 + */ + @TableField(value = "created_time") + @ApiModelProperty(value = "创建时间") + private String createdTime; + + + + /** + * 是否删除(0 :否 1：是) + */ + @TableField(value = "is_del") + @ApiModelProperty(value = "是否删除(0 :否 1：是)") + private Integer isDel; + + @TableField(value = "created_by") + @ApiModelProperty(value = "操作人编码") + private String createdBy; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainEntity.java index 15fb71e9..2034ef51 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainEntity.java @@ -116,5 +116,10 @@ public class OptionalEbomMainEntity implements Serializable { @TableField(value = "serial_no") @ApiModelProperty(value = "序号") private Integer serialNo; + @TableField(value = "version") + @ApiModelProperty(value = "版本") + private Integer version; + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainHistoryEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainHistoryEntity.java new file mode 100644 index 00000000..d941f6a5 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomMainHistoryEntity.java @@ -0,0 +1,127 @@ +package com.nflg.product.bomnew.pojo.entity; + + +import cn.hutool.core.date.DateUtil; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@ApiModel("移动破ebom主表(模版)") +@Accessors(chain = true) +@TableName(value = "t_optional_ebom_main_history") +public class OptionalEbomMainHistoryEntity implements Serializable { + + /** + * 主键 + */ + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "行id") + private Long rowId; + + @TableField(value = "source_row_id") + @ApiModelProperty(value = "父id") + private Long sourceRowId; + + + /** + * 机型编号 + */ + @TableField(value = "device_no") + @ApiModelProperty(value = "机型编号") + private String deviceNo; + /** + * 机型名称 + */ + @TableField(value = "device_name") + @ApiModelProperty(value = "机型名称") + private String deviceName; + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + /** + * 是否显示（0 为隐藏 1显示） + */ + @TableField(value = "is_enable") + @ApiModelProperty(value = "是否显示（0 为隐藏 1显示）") + private Integer isEnable; + /** + * 部门id + */ + @TableField(value = "dept_row_id") + @ApiModelProperty(value = "部门id") + private Long deptRowId; + /** + * 部门名称 + */ + @TableField(value = "dept_name") + @ApiModelProperty(value = "部门名称") + private String deptName; + /** + * 创建人编码 + */ + @TableField(value = "created_by") + @ApiModelProperty(value = "创建人编码") + private String createdBy; + /** + * 创建时间 + */ + @TableField(value = "created_time") + @ApiModelProperty(value = "创建时间") + private String createdTime; + + + + /** + * 变更时间 + */ + @TableField(value = "updated_time") + @ApiModelProperty(value = "变更时间") + private String updatedTime; + + public String getUpdatedTime(){ + + return DateUtil.now(); + + } + + /** + * 更改人编码 + */ + @TableField(value = "updated_by") + @ApiModelProperty(value = "更改人编码") + private String updatedBy; + /** + * 是否删除(0 :否 1：是) + */ + @TableField(value = "is_del") + @ApiModelProperty(value = "是否删除(0 :否 1：是)") + private Integer isDel; + + @TableField(value = "real_name") + @ApiModelProperty(value = "创建人姓名") + private String realName; + + @TableField(value = "serial_no") + @ApiModelProperty(value = "序号") + private Integer serialNo; + @TableField(value = "version") + @ApiModelProperty(value = "版本") + private Integer version; + + + + + + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java index 363eabb7..3227d6ed 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java @@ -3,6 +3,7 @@ package com.nflg.product.bomnew.pojo.vo; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.nflg.product.bomnew.constant.FactoryCodeEnum; +import com.nflg.product.bomnew.constant.MBomConstantEnum; import com.nflg.product.bomnew.util.EnumUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -247,6 +248,27 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "状态 0-待处理 1-待退回 2-已退") private Integer materialBackStatus; + + + @ApiModelProperty(value = "状态") + private String statusName; + + public String getStatusName(){ + if(materialBackStatus==null || materialBackStatus.equals(MBomConstantEnum.MaterialBackStatusEnum.APPLY_0.getValue())){ + if(MBomConstantEnum.MBomStatusEnum.PUB_SAP.getValue().equals(status)){ + return MBomConstantEnum.MBomStatusEnum.PUB_SAP.getDescription(); + } + return MBomConstantEnum.MaterialBackStatusEnum.APPLY_0.getDescription(); + + }else if(materialBackStatus.equals(MBomConstantEnum.MaterialBackStatusEnum.DEAL_1.getValue())){ + return MBomConstantEnum.MaterialBackStatusEnum.DEAL_1.getDescription(); + }else if(materialBackStatus.equals(MBomConstantEnum.MaterialBackStatusEnum.REJECT_2.getValue())){ + return MBomConstantEnum.MaterialBackStatusEnum.REJECT_2.getDescription(); + } + return ""; + } + + /** * 0-非虚拟包 1-发货包 2-制作包 4-直发包 8-发货前装配包 */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java index 279e0a5d..d2b09c7a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java @@ -102,6 +102,12 @@ public class OptionalEbomConfigVO implements Serializable { private String drawingNo; @ApiModelProperty("物料描述") private String materialDesc; + @ApiModelProperty(value = "当前版本") + private Integer currentVersion; + @ApiModelProperty(value = "机型版本") + private Integer version; + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java index 802fb978..61514ef5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportChildVO.java @@ -97,7 +97,7 @@ public class OptionalEbomImportChildVO implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") - private Date createdTime; + private String createdTime; /** * 操作人编码 */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportVO.java index cd9d84e3..a61f0354 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomImportVO.java @@ -51,7 +51,7 @@ public class OptionalEbomImportVO implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") - private Date createdTime; + private String createdTime; /** * 是否删除(0 :否 1：是) */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomMainVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomMainVO.java index 5b79496b..4209f185 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomMainVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomMainVO.java @@ -85,5 +85,6 @@ public class OptionalEbomMainVO implements Serializable { private String realName; @ApiModelProperty(value = "序号") private Integer serialNo; - + @ApiModelProperty(value = "版本") + private Integer version; } 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 b1b26f41..a8d92da1 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 @@ -1225,9 +1225,14 @@ public class BomNewEbomParentService extends ServiceImpl= 0) { -// baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue()); -// } + else if (StrUtil.isBlank(baseMaterialVO.getMaterialNo()) || Objects.isNull(baseMaterialVO.getNum()) || BigDecimal.ZERO.compareTo(baseMaterialVO.getNum()) >= 0) { + baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue()); + } else if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo()) && Objects.isNull(baseMaterialVO.getMaterialState())) { baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java index 9cdf3af1..4da266ae 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java @@ -99,12 +99,11 @@ public class OptionalEbomConfigService extends ServiceImpl { + + + +} + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java index f5c10f18..50ec9a64 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java @@ -112,6 +112,15 @@ public class OptionalEbomImportChildService extends ServiceImpl { @@ -173,8 +182,19 @@ public class OptionalEbomImportChildService extends ServiceImpl { + + + + +} + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainHistoryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainHistoryService.java new file mode 100644 index 00000000..1c69c730 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainHistoryService.java @@ -0,0 +1,88 @@ +package com.nflg.product.bomnew.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.TypeReference; +import cn.hutool.extra.spring.SpringUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.nflg.product.base.core.conmon.util.SessionUtil; +import com.nflg.product.base.core.vo.PageVO; +import com.nflg.product.bomnew.constant.OptionalBomConstant; +import com.nflg.product.bomnew.mapper.master.OptionalEbomMainHistoryMapper; +import com.nflg.product.bomnew.mapper.master.OptionalEbomMainMapper; +import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDTO; +import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDelDTO; +import com.nflg.product.bomnew.pojo.entity.*; +import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery; +import com.nflg.product.bomnew.pojo.vo.*; +import com.nflg.product.bomnew.service.aggreg.AggregOptionConfigService; +import com.nflg.product.bomnew.service.domain.OptionalEBom.ConvertToMainHistory; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 移动破模版数据 + */ +@Service +public class OptionalEbomMainHistoryService extends ServiceImpl { + + public void convertToHistory(Long mainRowId) { + convertToHistory(mainRowId,true); + } + + /** + * + * @param mainRowId + + */ + + public void convertToHistory(Long mainRowId,boolean isUpdateV) { + + ConvertToMainHistory convertToMainHistory= new ConvertToMainHistory(); + + convertToMainHistory.convertToMainHistory(mainRowId); + + convertToHistory(convertToMainHistory,isUpdateV); + + } + + + @Transactional(rollbackFor = Exception.class) + public void convertToHistory(ConvertToMainHistory convertToMainHistory,boolean isUpdateV) { + + //保存机型 + SpringUtil.getBean(OptionalEbomMainHistoryService.class).save(convertToMainHistory.getOptionalEbomMainHistoryEntity() ); + + //选项 + SpringUtil.getBean(OptionalEbomImportHistoryService.class).saveBatch(convertToMainHistory.getImportHistoryList()); + //标配 + SpringUtil.getBean(OptionalEbomImportChildHistoryService.class).saveBatch(convertToMainHistory.getImportChildHistoryList()); + + + //是否更新版本 + if( isUpdateV) { + //变更版本 + OptionalEbomMainEntity updateMainEntity = new OptionalEbomMainEntity(); + updateMainEntity.setVersion(convertToMainHistory.getMainEntity().getVersion() + 1); + updateMainEntity.setRowId(convertToMainHistory.getMainEntity().getRowId()); + updateMainEntity.setUpdatedBy(SessionUtil.getUserCode()); + updateMainEntity.setUpdatedTime(DateUtil.now()); + SpringUtil.getBean(OptionalEbomMainService.class).updateById(updateMainEntity); + } + + } + +} + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java index cdd7d3f9..b31e3e99 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomMainService.java @@ -91,8 +91,14 @@ public class OptionalEbomMainService extends ServiceImpl delList = new ArrayList<>(); List updateList = new ArrayList<>(); List delTmpList = new ArrayList<>(); + + + if (CollectionUtil.isNotEmpty(longList)) { for (Long rowId : longList) { + + SpringUtil.getBean(OptionalEbomMainHistoryService.class).convertToHistory(rowId,false); + QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.lambda().eq(OptionalEbomConfigEntity::getParentRowId, rowId); //找出暂存表里 已发布 和暂存数据 @@ -135,7 +141,6 @@ public class OptionalEbomMainService extends ServiceImpl delOptionWrapper= new QueryWrapper(); delOptionWrapper.lambda().in(OptionalEbomConfigREntity::getParentRowId,delTmpList); SpringUtil.getBean(OptionalEbomConfigRService.class).remove(delOptionWrapper); - } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index b7593728..772982f0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java @@ -107,6 +107,13 @@ public class OptionalMbomMaterialService extends ServiceImpl getChild(Long rowId) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java index 33b0d1c9..216c1559 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.TypeReference; +import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nflg.product.bomnew.constant.OptionalBomConstant; @@ -53,7 +54,7 @@ public class AggregOptionConfigService { for (; iter.hasNext(); ) { // 找出父节点 OptionalEbomImportVO tree = iter.next(); - if (tree.getParentRowId() == null || 0 == tree.getParentRowId()) { + if (tree.getParentRowId() == null || 0 == tree.getParentRowId().longValue()) { if (tree.getChild() == null) { tree.setChild(new ArrayList()); } @@ -95,7 +96,7 @@ public class AggregOptionConfigService { } - private OptionalEbomConfigAggregVO filterTree(List listParent, List listChild) { + public OptionalEbomConfigAggregVO filterTree(List listParent, List listChild) { recursionMethod(listParent);//二层树形 @@ -188,6 +189,31 @@ public class AggregOptionConfigService { // item.setUpdatedTime(new Date()); // }); // } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.lambda().eq(OptionalEbomImportChildEntity::getRootRowId, optionalEbomMainEntity.getRowId()); + queryWrapper2.lambda().eq(OptionalEbomImportChildEntity::getPartType, OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue()); + List entityList = SpringUtil.getBean(OptionalEbomImportChildService.class).list(queryWrapper2); + + Map> goupOption= dto.getOptions().stream().collect(Collectors.groupingBy(OptionalEbomSubmitEditDTO.OptionalEbomImportChildSubmitDTO::getRowId)); + //有变更数据保存一份 + for(OptionalEbomImportChildEntity item:entityList){ + if(CollectionUtil.isEmpty(goupOption.get(item.getRowId()))) { + continue; + + } + OptionalEbomSubmitEditDTO.OptionalEbomImportChildSubmitDTO option = goupOption.get(item.getRowId()).get(0); + if (!Objects.equals(option.getChooseStatus(), item.getChooseStatus())) { + SpringUtil.getBean(OptionalEbomMainHistoryService.class).convertToHistory(dto.getDeviceInfo().getRowId()); + break; + } + + + + } + + return optionalEbomImportChildService.updateBatchById(optionalEbomImportChildEntityList); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java index 157fae6d..6338cfd9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java @@ -22,10 +22,8 @@ import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity; import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity; import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; -import com.nflg.product.bomnew.service.MaterialMainService; -import com.nflg.product.bomnew.service.OptionalEbomImportChildService; -import com.nflg.product.bomnew.service.OptionalEbomImportService; -import com.nflg.product.bomnew.service.OptionalEbomMainService; +import com.nflg.product.bomnew.service.*; +import com.nflg.product.bomnew.service.domain.OptionalEBom.ConvertToMainHistory; import lombok.extern.slf4j.Slf4j; import nflg.product.common.constant.STATE; import org.apache.commons.lang.StringUtils; @@ -410,6 +408,10 @@ public class OptionalExcelService { List parentOptionList = ebomImportExcelDTO.getOptionInfo(); + + ConvertToMainHistory convertToMainHistory=new ConvertToMainHistory(); + convertToMainHistory.convertToMainHistory(optionalEbomMainEntity.getRowId()); + //保存选项 for (OptionalEbomImportDTO parentOption : parentOptionList) { @@ -434,6 +436,9 @@ public class OptionalExcelService { List childOptionList = parentOption.getChild(); + + + for (OptionalEbomImportDTO childOption : childOptionList) { QueryWrapper queryWrapper2 = new QueryWrapper<>(); @@ -488,6 +493,10 @@ public class OptionalExcelService { } + //首次添加设备不用操作保存历史记录 + if(queryDevice!=null){ + SpringUtil.getBean(OptionalEbomMainHistoryService.class).convertToHistory(convertToMainHistory,true); + } return true; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalEBom/ConvertToMainHistory.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalEBom/ConvertToMainHistory.java new file mode 100644 index 00000000..450c2c33 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalEBom/ConvertToMainHistory.java @@ -0,0 +1,183 @@ +package com.nflg.product.bomnew.service.domain.OptionalEBom; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.TypeReference; +import cn.hutool.extra.spring.SpringUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.nflg.product.bomnew.constant.OptionalBomConstant; +import com.nflg.product.bomnew.pojo.entity.*; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomConfigAggregVO; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO; +import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportVO; +import com.nflg.product.bomnew.service.OptionalEbomImportChildService; +import com.nflg.product.bomnew.service.OptionalEbomImportService; +import com.nflg.product.bomnew.service.OptionalEbomMainService; +import com.nflg.product.bomnew.service.aggreg.AggregOptionConfigService; +import lombok.Getter; + +import java.lang.reflect.Type; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class ConvertToMainHistory { + + @Getter + private OptionalEbomMainEntity mainEntity; + @Getter + private OptionalEbomMainHistoryEntity optionalEbomMainHistoryEntity; + @Getter + private List importHistoryList; + + @Getter + private List importChildHistoryList; + + public void convertToMainHistory(Long mainRowId) { + + + mainEntity = SpringUtil.getBean(OptionalEbomMainService.class).getById(mainRowId); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.lambda().eq(OptionalEbomImportEntity::getRootRowId, mainRowId); + + List optionalEbomImportEntityList = SpringUtil.getBean(OptionalEbomImportService.class).list(queryWrapper1); + if(CollectionUtil.isEmpty(optionalEbomImportEntityList)){ + return; + } + //选配 + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.lambda().eq(OptionalEbomImportChildEntity::getRootRowId, mainRowId); + queryWrapper2.lambda().eq(OptionalEbomImportChildEntity::getPartType, OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue()); + List optionalEbomImportChildEntityList = SpringUtil.getBean(OptionalEbomImportChildService.class).list(queryWrapper2); + + + optionalEbomMainHistoryEntity = Convert.convert(OptionalEbomMainHistoryEntity.class, mainEntity); + optionalEbomMainHistoryEntity.setSourceRowId(optionalEbomMainHistoryEntity.getRowId()); + optionalEbomMainHistoryEntity.setRowId(IdWorker.getId()); + optionalEbomMainHistoryEntity.setCreatedTime(DateUtil.now()); + + List lv1List = optionalEbomImportEntityList.stream().filter(item -> (item.getParentRowId() == null || item.getParentRowId().longValue() == 0)).collect(Collectors.toList()); + + + Map> lv2GroupChild = optionalEbomImportEntityList.stream().filter(item -> (item.getParentRowId() != null && item.getParentRowId().longValue() > 0)).collect(Collectors.groupingBy(OptionalEbomImportEntity::getParentRowId)); + + + Map> lv3GroupChild = optionalEbomImportChildEntityList.stream().collect(Collectors.groupingBy(OptionalEbomImportChildEntity::getParentRowId)); + + if (CollectionUtil.isNotEmpty(lv1List)) { + for (OptionalEbomImportEntity lv1 : + lv1List) { + + List lv2List = lv2GroupChild.get(lv1.getRowId()); + lv1.setRowId(IdWorker.getId()); + lv1.setRootRowId(optionalEbomMainHistoryEntity.getRowId()); + lv1.setCreatedTime(DateUtil.now()); + + if (CollectionUtil.isNotEmpty(lv2List)) { + for (OptionalEbomImportEntity lv2 : + lv2List) { + + List lv3List = lv3GroupChild.get(lv2.getRowId()); + lv2.setRowId(IdWorker.getId()); + lv2.setRootRowId(optionalEbomMainHistoryEntity.getRowId()); + lv2.setParentRowId(lv1.getRowId()); + lv2.setCreatedTime(DateUtil.now()); + if (CollectionUtil.isNotEmpty(lv3List)) { + for (OptionalEbomImportChildEntity lv3 : + lv3List) { + lv3.setRowId(IdWorker.getId()); + lv3.setRootRowId(optionalEbomMainHistoryEntity.getRowId()); + lv3.setParentRowId(lv2.getRowId()); + lv3.setCreatedTime(DateUtil.now()); + + } + } + + } + } + + } + } + + + importHistoryList = Convert.convert(new TypeReference>() { + }, optionalEbomImportEntityList); + + importChildHistoryList = Convert.convert(new TypeReference>() { + }, optionalEbomImportChildEntityList); + + +// OptionalEbomMainEntity mainEntity = SpringUtil.getBean(OptionalEbomMainService.class).getById(mainRowId); +// +// List optionalEbomImportVOList=SpringUtil.getBean(OptionalEbomImportService.class).getByRootIdList(mainRowId); +// +// +// //选配 +// QueryWrapper queryWrapper2=new QueryWrapper(); +// queryWrapper2.lambda().eq(OptionalEbomImportChildEntity::getRootRowId,mainRowId); +// queryWrapper2.lambda().eq(OptionalEbomImportChildEntity::getPartType, OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue()); +// List optionalEbomImportChildEntityList=SpringUtil.getBean(OptionalEbomImportChildService.class).list(queryWrapper2); +// +// List optionalEbomImportChildVOList= Convert.convert( new TypeReference>() { +// }, optionalEbomImportChildEntityList); +// +// OptionalEbomConfigAggregVO optionalEbomConfigAggregVO= SpringUtil.getBean(AggregOptionConfigService.class).filterTree(optionalEbomImportVOList,optionalEbomImportChildVOList); +// +// +// +// +// optionalEbomMainHistoryEntity= Convert.convert(OptionalEbomMainHistoryEntity.class,mainEntity); +// optionalEbomMainHistoryEntity.setSourceRowId(optionalEbomMainHistoryEntity.getRowId()); +// optionalEbomMainHistoryEntity.setRowId(IdWorker.getId()); +// optionalEbomMainHistoryEntity.setCreatedTime(DateUtil.now()); +// +// +// if(CollectionUtil.isNotEmpty(optionalEbomConfigAggregVO.getSingleList())){ +// +// for (OptionalEbomImportVO lv1: +// optionalEbomConfigAggregVO.getSingleList()) { +// +// lv1.setRowId(IdWorker.getId()); +// lv1.setRootRowId(optionalEbomMainHistoryEntity.getRowId()); +// lv1.setCreatedTime(DateUtil.now()); +// if(CollectionUtil.isNotEmpty(lv1.getChild())){ +// List lv2List=lv1.getChild(); +// +// for (OptionalEbomImportVO lv2: +// lv2List) { +// +// lv2.setRowId(IdWorker.getId()); +// lv2.setRootRowId(optionalEbomMainHistoryEntity.getRowId()); +// lv2.setParentRowId(lv1.getRowId()); +// lv2.setCreatedTime(DateUtil.now()); +// if(CollectionUtil.isNotEmpty(lv2.getChild())){ +// List lv3List=lv2.getChild(); +// +// for (OptionalEbomImportChildVO lv3: +// lv3List) { +// +// lv3.setRowId(IdWorker.getId()); +// lv3.setRootRowId(optionalEbomMainHistoryEntity.getRowId()); +// lv3.setParentRowId(lv2.getRowId()); +// lv3.setCreatedTime(DateUtil.now()); +// +// } +// +// } +// +// } +// +// } +// +// } +// +// } +// + + + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml index c0a200c1..eeb0c192 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml @@ -10,6 +10,8 @@ + + @@ -17,6 +19,8 @@ + + row_id,config_no,parent_row_id,device_no,device_name,edit_status,upload_sap_status,remark,dept_name,real_name,created_by,created_time,updated_time @@ -29,14 +33,18 @@