From b0d89937baa798bb8974449d61a4b641f2d6d586 Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 2 Jan 2024 22:54:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B4=A2=E5=BC=95=E6=9E=84?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/MBomApi.java | 6 +- .../mapper/master/BomNewMbomParentMapper.java | 24 ++ .../pojo/query/BomNewMbomParentQuery.java | 2 - .../bomnew/pojo/vo/BomNewMbomMiddleVO.java | 207 ++++++++++++++++++ .../mapper/master/BomNewMbomParentMapper.xml | 58 ++++- 5 files changed, 284 insertions(+), 13 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/MBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/MBomApi.java index 7af8fb33..e508337e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/MBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/MBomApi.java @@ -31,7 +31,7 @@ import java.util.Objects; * @author makejava * @since 2024-01-01 10:53:24 */ -@Api(tags = "接口") +@Api(tags = "Mbom接口") @RestController @RequestMapping("mbom") public class MBomApi extends BaseApi { @@ -94,8 +94,8 @@ public class MBomApi extends BaseApi { if(StrUtil.isEmpty(EnumUtils.getEnumDescription(MBomConstantEnum.MBomSuperMaterialStatusEnum.class,status))){ throw new NflgBusinessException(STATE.ParamErr,"status 不在范围内"); } - - return ResultVO.success(); + bomNewMbomDetailService.superSaterialStatusTag(rowId,status); + return ResultVO.success(true); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java index 0bea9697..5473315f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java @@ -2,7 +2,15 @@ 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.BomNewMbomParentEntity; +import com.nflg.product.bomnew.pojo.query.BomNewMbomParentQuery; +import com.nflg.product.bomnew.pojo.query.OriginalBomQuery; +import com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO; +import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * t_bom_new_mbom_parent 表数据库访问层 @@ -12,4 +20,20 @@ import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity; * @since 2024-01-01 10:53:24 */ public interface BomNewMbomParentMapper extends BaseMapper { + + + Page getMBomListPage(Page page, @Param("query") BomNewMbomParentQuery query ); + + /** + * 查询索引 + * @param page + * @param query + * @return + */ + Page indexListPage(Page page, @Param("query") BomNewMbomParentQuery query ); + + List searchList(@Param("rowId") Long rowId ); + + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewMbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewMbomParentQuery.java index 83146a41..43aef190 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewMbomParentQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewMbomParentQuery.java @@ -61,8 +61,6 @@ public class BomNewMbomParentQuery extends BasePageQuery implements Serializabl private String endDate; - @ApiModelProperty(value = "来源行ID(PBOM中parent的行ID)") - private Long sourceRowId; 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 new file mode 100644 index 00000000..343a8f35 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java @@ -0,0 +1,207 @@ +package com.nflg.product.bomnew.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * t_bom_new_mbom_parent + * + * + * @author makejava + * @since 2024-01-01 10:53:26 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="com-nflg-product-bomnew-pojo-new-vo-BomNewMbomMiddleVO") +public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable { + + /** + * 主键行ID-雪花 + */ + @ApiModelProperty(value = "主键行ID-雪花") + private Long rowId; + + + /** + * bom版本行ID,和mbom_parent表row_id关联 + */ + @ApiModelProperty(value = "bom版本行ID,和mbom_parent表row_id关联") + private Long bomRowId; + + /** + * 父级行ID + */ + @ApiModelProperty(value = "父级行ID") + private Long parentRowId; + + + + /** + * 批号-来自plm-临时 + */ + @ApiModelProperty(value = "批号-来自plm-临时") + private String batchNo; + + + + /** + * 工厂编码 + */ + @ApiModelProperty(value = "工厂编码") + private String facCode; + + + + /** + * 排序号 + */ + @ApiModelProperty(value = "排序号") + private String orderNumber; + + + + + + + + + + + /** + * 版本号 + */ + @ApiModelProperty(value = "版本号") + private String currentVersion; + + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private BigDecimal num; + + /** + * 是否最新版：0-否 1-是 + */ + @ApiModelProperty(value = "是否最新版：0-否 1-是") + private Integer lastVersionIs; + + /** + * 1、待发布（sap）、3=已发布 + */ + @ApiModelProperty(value = "1、待发布（sap）、3=已发布") + private Integer status; + + /** + * 发布sap人员 + */ + @ApiModelProperty(value = "发布sap人员") + private String sysnSapUserName; + + /** + * 发布sap时间 + */ + @ApiModelProperty(value = "发布sap时间") + private LocalDateTime sysnSapTime; + + /** + * 来源行ID(PBOM中parent的行ID) + */ + @ApiModelProperty(value = "来源行ID(PBOM中parent的行ID)") + private Long sourceRowId; + + /** + * 设计人员编码 + */ + @ApiModelProperty(value = "设计人员编码") + private String deviseUserCode; + + /** + * 设计人员名称 + */ + @ApiModelProperty(value = "设计人员名称") + private String deviseName; + + /** + * 创建人编码 + */ + @ApiModelProperty(value = "创建人编码") + private String createdBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private LocalDateTime createdTime; + + /** + * 版本过期时间=下个版本的创建时间 + */ + @ApiModelProperty(value = "版本过期时间=下个版本的创建时间") + private LocalDateTime expireEndTime; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 设计维护部门名称 + */ + @ApiModelProperty(value = "设计维护部门名称") + private String deptName; + + /** + * bom树的高度 + */ + @ApiModelProperty(value = "bom树的高度") + private Integer levelNum; + + /** + * 升版说明 + */ + @ApiModelProperty(value = "升版说明") + private String changeDesc; + + /** + * 通知单号 + */ + @ApiModelProperty(value = "通知单号") + private String noticeNums; + + /** + * 订单号 + */ + @ApiModelProperty(value = "订单号") + private String orderNo; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + private LocalDateTime modifyTime; + + + + /** + * 超级物料 0-否 1-是 + */ + @ApiModelProperty(value = "超级物料 0-否 1-是") + private Integer superMaterialStatus; + + /** + * 是否虚拟件 0-否 1-是 + */ + @ApiModelProperty(value = "是否虚拟件 0-否 1-是") + private Integer virtualPartIs; + + + + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index 31c884e4..eda0fa6b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -47,6 +47,9 @@ + + + @@ -57,35 +60,74 @@ and material_no=#{query.materialNo} - and fac_code=#{facCode} + and fac_code=#{query.facCode} + + + + + = #{query.startDate} and created_time <=#{query.endDate}]]> + + + + + and order_no=#{query.orderNo} + + - select * from t_bom_new_mbom_parent where `status`=#{query.status} - + - - = #{query.startDate} and created_time <=#{query.endDate}]]> + + + = #{query.startDate} and sysn_sap_time <=#{query.endDate}]]> + + - select * from t_bom_new_mbom_parent where `status`=#{query.status} - + - + = #{query.startDate} and sysn_sap_time <=#{query.endDate}]]> + + +