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

feat(ebom): 调整批量查询物料信息接口

This commit is contained in:
曹鹏飞 2024-05-25 17:39:38 +08:00
parent 4cf4c95c83
commit a724c8f2f4
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,9 +452,14 @@ public class EbomApi extends BaseApi {
return ResultVO.success(bomNewEbomParentService.getSource(rowId)); return ResultVO.success(bomNewEbomParentService.getSource(rowId));
} }
/**
* 批量查询物料信息
* @param query query
* @return 物料信息
*/
@PostMapping("queryMaterials") @PostMapping("queryMaterials")
@ApiOperation("批量查询物料信息") @ApiOperation("批量查询物料信息")
public ResultVO<List<BaseMaterialVO>> queryMaterials(@Valid @RequestBody QueryMaterialsQuery query) { public ResultVO<List<BaseMaterialVO>> queryMaterials(@Valid @RequestBody @NotEmpty List<QueryMaterialsQuery> query) {
return ResultVO.success(bomNewEbomParentService.queryMaterials(query)); return ResultVO.success(bomNewEbomParentService.queryMaterials(query));
} }
} }

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

@ -2350,13 +2350,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
return null; return null;
} }
public List<BaseMaterialVO> queryMaterials(QueryMaterialsQuery query) { public List<BaseMaterialVO> queryMaterials(List<QueryMaterialsQuery> query) {
if (query.getType() == 0) { List<BaseMaterialVO> datas = new ArrayList<>();
return SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(query.getKeys()); List<String> keys = query.stream().map(QueryMaterialsQuery::getMaterialNo)
} else if (query.getType() == 1) { .filter(StrUtil::isNotBlank)
return SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(query.getKeys()); .distinct()
} else { .collect(Collectors.toList());
throw new NflgBusinessException(STATE.BusinessError, "无效的类别"); if (CollUtil.isNotEmpty(keys)) {
datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(keys));
} }
keys = query.stream()
.filter(it -> StrUtil.isBlank(it.getMaterialNo()) && StrUtil.isNotBlank(it.getDrawingNo()))
.map(QueryMaterialsQuery::getDrawingNo)
.distinct()
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(keys)) {
datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(keys));
}
return datas;
} }
} }