From daf22902173abb97bd3abbde15d397fdbaaac4a9 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 15 Dec 2023 22:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalMbomApi.java | 11 +-- .../master/OptionalMbomMaterialMapper.java | 5 +- .../pojo/dto/OptionalMbomMaterialDTO.java | 2 +- .../pojo/vo/OptionalMbomMaterialListVO.java | 98 +++++++++++++++++++ .../pojo/vo/OptionalMbomMaterialVO.java | 2 +- .../service/OptionalMbomMaterialService.java | 18 +++- .../aggreg/AggregOptionConfigService.java | 7 +- .../master/OptionalMbomMaterialMapper.xml | 4 +- 8 files changed, 125 insertions(+), 22 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialListVO.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java index 68327148..1adb8ad1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java @@ -14,10 +14,7 @@ import com.nflg.product.bomnew.pojo.dto.OptionalEbomSubmitEditDTO; import com.nflg.product.bomnew.pojo.query.OptionalEbomConfigListQuery; import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery; import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialListQuery; -import com.nflg.product.bomnew.pojo.vo.OptionalEbomConfigAggregVO; -import com.nflg.product.bomnew.pojo.vo.OptionalEbomConfigVO; -import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO; -import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialVO; +import com.nflg.product.bomnew.pojo.vo.*; import com.nflg.product.bomnew.service.OptionalEbomConfigService; import com.nflg.product.bomnew.service.OptionalEbomImportChildService; import com.nflg.product.bomnew.service.OptionalEbomMainService; @@ -73,9 +70,7 @@ public class OptionalMbomApi extends BaseApi { @PostMapping("getMaterialParentList") @ApiOperation("物料分页数据") - public ResultVO> getMaterialParentList(@RequestBody OptionalMbomMaterialListQuery query) { - - + public ResultVO> getMaterialParentList(@RequestBody OptionalMbomMaterialListQuery query) { query.setCreatedBy(SessionUtil.getUserCode()); return ResultVO.success(this.optionalMbomMaterialService.getListPage(query)); } @@ -84,7 +79,7 @@ public class OptionalMbomApi extends BaseApi { @GetMapping("getMaterialChildList") @ApiOperation("物料子数据") - public ResultVO> getMaterialChildList(@ApiParam("父id") @RequestParam("rowId") Long rowId) { + public ResultVO> getMaterialChildList(@ApiParam("父id") @RequestParam("rowId") Long rowId) { return ResultVO.success(this.optionalMbomMaterialService.getChild(rowId)); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java index 87aa2da1..6db7dd3c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java @@ -13,6 +13,7 @@ package com.nflg.product.bomnew.mapper.master; import com.nflg.product.bomnew.pojo.query.OptionalEbomMainListQuery; import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialListQuery; import com.nflg.product.bomnew.pojo.vo.OptionalEbomMainVO; + import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO; import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,8 +29,8 @@ import java.util.List; public interface OptionalMbomMaterialMapper extends BaseMapper { - IPage getListPage(Page page, @Param("query") OptionalMbomMaterialListQuery query); - public List getChild(@Param("rowId") Long rowId); + Page getListPage(Page page, @Param("query") OptionalMbomMaterialListQuery query); + public List getChild(@Param("rowId") Long rowId); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalMbomMaterialDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalMbomMaterialDTO.java index a6be5b71..fe0987ce 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalMbomMaterialDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalMbomMaterialDTO.java @@ -63,7 +63,7 @@ public class OptionalMbomMaterialDTO 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/OptionalMbomMaterialListVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialListVO.java new file mode 100644 index 00000000..7b00c3c2 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialListVO.java @@ -0,0 +1,98 @@ +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.util.Date; + +@Data +@ApiModel("mbom发布生成的物料信息") +@Accessors(chain = true) +public class OptionalMbomMaterialListVO extends BaseMaterialVO { + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private Long rowId; + /** + * 父表Id (t_optional_ebom_config ) + */ + @ApiModelProperty(value = "上层id") + private Long parentRowId; + /** + * 上层id + */ + @ApiModelProperty(value = "根id") + private Long rootRowId;; + /** + * 物料编码 + */ +// @ApiModelProperty(value = "物料编码") +// private String materialNo; + /** + * 物料名 + */ +// @ApiModelProperty(value = "物料名") +// private String materialName; + /** + * 物料描述 + */ +// @ApiModelProperty(value = "物料描述") +// private String materialDesc; + /** + * 图号 + */ +// @ApiModelProperty(value = "图号") +// private String drawingNo; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remak; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createdTime; + /** + * 操作人编码 + */ + @ApiModelProperty(value = "操作人编码") + private String createdBy; + + /** + * 机型编号 + */ + @ApiModelProperty(value = "机型编号") + private String deviceNo; + /** + * 机型名称 + */ + @ApiModelProperty(value = "机型名称") + private String deviceName; + + /** + * 是否导入sap(0 :否 1: 是) + */ + @ApiModelProperty(value = "是否导入sap(0 :否 1: 是)") + private Integer uploadSapStatus; + + /** + * 部门名称 + */ + @ApiModelProperty(value = "部门名称") + private String deptName; + /** + * 部门id + */ + @ApiModelProperty(value = "部门id") + private Long deptRowId; + /** + * 操作人姓名 + */ + @ApiModelProperty(value = "操作人姓名") + private String realName; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialVO.java index c26ff225..e864107e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialVO.java @@ -20,7 +20,7 @@ import java.util.Date; @Data @ApiModel("mbom发布生成的物料信息") @Accessors(chain = true) -public class OptionalMbomMaterialVO implements Serializable { +public class OptionalMbomMaterialVO { /** * 主键 */ 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 caaa97d3..6173745d 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 @@ -11,10 +11,12 @@ import com.nflg.product.bomnew.pojo.entity.OptionalMbomMaterialEntity; import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialListQuery; +import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO; import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialVO; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -24,13 +26,21 @@ import java.util.List; public class OptionalMbomMaterialService extends ServiceImpl { - public IPage getListPage(OptionalMbomMaterialListQuery query) { - IPage list = this.getBaseMapper().getListPage(new Page<>(query.getPage(), query.getPageSize()), query); + + + @Resource + MaterialMainService materialMainService; + public Page getListPage(OptionalMbomMaterialListQuery query) { + Page list = this.getBaseMapper().getListPage(new Page<>(query.getPage(), query.getPageSize()), query); + materialMainService.intiMaterialInfo(list.getRecords()); return list; } - public List getChild(Long rowId) { - return this.getBaseMapper().getChild(rowId); + public List getChild(Long rowId) { + List list= this.getBaseMapper().getChild(rowId); + + materialMainService.intiMaterialInfo(list); + return list; } 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 05c70e3e..f4176bd5 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 @@ -16,10 +16,7 @@ import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity; import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity; import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery; import com.nflg.product.bomnew.pojo.vo.*; -import com.nflg.product.bomnew.service.OptionalEbomConfigService; -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 org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -41,6 +38,8 @@ public class AggregOptionConfigService { @Resource private OptionalEbomConfigService optionalEbomConfigService; + @Resource + MaterialMainService materialMainService; /** * 递归方法转换成树形结构 diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml index 0bee0ff1..d8f469d7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml @@ -47,7 +47,7 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin - select t1.*,t2.device_name, t2.device_no, @@ -82,7 +82,7 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin - select t1.*,t2.device_name, t2.device_no,