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

Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom

This commit is contained in:
曹鹏飞 2024-05-27 17:10:33 +08:00
parent 760ae24a8e a1dfac009d
commit 94a00cbd2d
4 changed files with 63 additions and 2 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/DQBomApi.java
View File

@ -259,4 +259,15 @@ public class DQBomApi extends BaseApi {
public ResultVO<List<QueryMaterialsVO>> queryMaterials(@Valid @RequestBody @NotEmpty List<QueryMaterialsQuery> query) {
return ResultVO.success(dQBomService.queryMaterials(query));
}
/**
* 查询物料信息
* @param query 查询条件
* @return
*/
@PostMapping("queryMaterial")
@ApiOperation("查询物料信息")
public ResultVO<QueryMaterialsVO> queryMaterial(@Valid @RequestBody @NotEmpty QueryMaterialsQuery query) {
return ResultVO.success(dQBomService.queryMaterial(query));
}
}

14
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/QueryMaterialsQuery.java
View File

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author 曹鹏飞
* @date 2024/5/25 14:17:04
@ -25,4 +27,16 @@ public class QueryMaterialsQuery {
*/
@ApiModelProperty(value = "物料编码")
private String materialNo;
/**
* 单重
*/
@ApiModelProperty(value = "单重")
private BigDecimal unitWeight;
/**
* 项目类别
*/
@ApiModelProperty("项目类别")
private String projectType;
}

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

@ -29,7 +29,7 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable {
* 设计维护部门名称
*/
@ApiModelProperty(value = "设计维护部门名称")
private String deptName = SessionUtil.getFullDeptName();
private String deptName = SessionUtil.getDepartName();
/**
* 创建时间

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

@ -683,6 +683,42 @@ public class DQBomService {
if (CollUtil.isNotEmpty(keys)) {
datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(keys));
}
return Convert.toList(QueryMaterialsVO.class, datas);
List<QueryMaterialsVO> vos = Convert.toList(QueryMaterialsVO.class, datas);
query.forEach(it -> {
if (Objects.nonNull(it.getUnitWeight()) || StrUtil.isNotBlank(it.getProjectType())) {
QueryMaterialsVO vo = vos.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), it.getMaterialNo())
|| StrUtil.equals(m.getDrawingNo(), it.getDrawingNo()))
.findFirst().orElse(null);
if (Objects.nonNull(vo)) {
if (Objects.nonNull(it.getUnitWeight())) {
vo.setUnitWeight(it.getUnitWeight());
}
if (StrUtil.isNotBlank(it.getProjectType())) {
vo.setProjectType(it.getProjectType());
}
}
}
});
return vos;
}
public QueryMaterialsVO queryMaterial(QueryMaterialsQuery query) {
List<BaseMaterialVO> vos = null;
if (StrUtil.isNotBlank(query.getMaterialNo())) {
vos = SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(Collections.singletonList(query.getMaterialNo()));
} else if (StrUtil.isNotBlank(query.getDrawingNo())) {
vos = SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(Collections.singletonList(query.getDrawingNo()));
}
if (CollUtil.isNotEmpty(vos)) {
QueryMaterialsVO vo = Convert.convert(QueryMaterialsVO.class, vos.get(0));
if (Objects.nonNull(query.getUnitWeight())) {
vo.setUnitWeight(query.getUnitWeight());
}
if (StrUtil.isNotBlank(query.getProjectType())) {
vo.setProjectType(query.getProjectType());
}
return vo;
}
return null;
}
}