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-transition

This commit is contained in:
曹鹏飞 2024-05-27 08:40:13 +08:00
parent 24276a95d7 e3488681d1
commit 10e07ad2f3
2 changed files with 24 additions and 0 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) { public ResultVO<List<QueryMaterialsVO>> queryMaterials(@Valid @RequestBody @NotEmpty List<QueryMaterialsQuery> query) {
return ResultVO.success(dQBomService.queryMaterials(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));
}
} }

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

@ -685,4 +685,17 @@ public class DQBomService {
} }
return Convert.toList(QueryMaterialsVO.class, datas); return Convert.toList(QueryMaterialsVO.class, datas);
} }
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)) {
return Convert.convert(QueryMaterialsVO.class, vos.get(0));
}
return null;
}
} }