rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

列表增加物料Id

This commit is contained in:
jing's 2023-12-15 22:00:41 +08:00
parent 520d61d8ef
commit daf2290217
8 changed files with 125 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java
View File

@ -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<IPage<OptionalMbomMaterialVO>> getMaterialParentList(@RequestBody OptionalMbomMaterialListQuery query) {
public ResultVO<IPage<OptionalMbomMaterialListVO>> 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<List<OptionalMbomMaterialVO>> getMaterialChildList(@ApiParam("父id") @RequestParam("rowId") Long rowId) {
public ResultVO<List<OptionalMbomMaterialListVO>> getMaterialChildList(@ApiParam("父id") @RequestParam("rowId") Long rowId) {
return ResultVO.success(this.optionalMbomMaterialService.getChild(rowId));
}

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java
View File

@ -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<OptionalMbomMaterialEntity> {
IPage<OptionalMbomMaterialVO> getListPage(Page<OptionalMbomMaterialVO> page, @Param("query") OptionalMbomMaterialListQuery query);
public List<OptionalMbomMaterialVO> getChild(@Param("rowId") Long rowId);
Page<OptionalMbomMaterialListVO> getListPage(Page page, @Param("query") OptionalMbomMaterialListQuery query);
public List<OptionalMbomMaterialListVO> getChild(@Param("rowId") Long rowId);
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalMbomMaterialDTO.java
View File

@ -63,7 +63,7 @@ public class OptionalMbomMaterialDTO implements Serializable {
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createdTime;
private String createdTime;
/**
* 操作人编码
*/

98
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialListVO.java Normal file
View File

@ -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;
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalMbomMaterialVO.java
View File

@ -20,7 +20,7 @@ import java.util.Date;
@Data
@ApiModel("mbom发布生成的物料信息")
@Accessors(chain = true)
public class OptionalMbomMaterialVO implements Serializable {
public class OptionalMbomMaterialVO {
/**
* 主键
*/

18
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
View File

@ -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<OptionalMbomMaterialMapper, OptionalMbomMaterialEntity> {
public IPage<OptionalMbomMaterialVO> getListPage(OptionalMbomMaterialListQuery query) {
IPage<OptionalMbomMaterialVO> list = this.getBaseMapper().getListPage(new Page<>(query.getPage(), query.getPageSize()), query);
@Resource
MaterialMainService materialMainService;
public Page<OptionalMbomMaterialListVO> getListPage(OptionalMbomMaterialListQuery query) {
Page<OptionalMbomMaterialListVO> list = this.getBaseMapper().getListPage(new Page<>(query.getPage(), query.getPageSize()), query);
materialMainService.intiMaterialInfo(list.getRecords());
return list;
}
public List<OptionalMbomMaterialVO> getChild(Long rowId) {
return this.getBaseMapper().getChild(rowId);
public List<OptionalMbomMaterialListVO> getChild(Long rowId) {
List<OptionalMbomMaterialListVO> list= this.getBaseMapper().getChild(rowId);
materialMainService.intiMaterialInfo(list);
return list;
}

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
View File

@ -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;
/**
* 递归方法转换成树形结构

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml
View File

@ -47,7 +47,7 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin
<!-- order by t1.created_time DESC-->
<!-- </select>-->
<select id="getListPage" resultType="com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialVO" >
<select id="getListPage" resultType="com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO" >
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>
<select id="getChild" resultType="com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialVO" >
<select id="getChild" resultType="com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO" >
select
t1.*,t2.device_name,
t2.device_no,