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

PBOM库存地点、ebom排序问题

This commit is contained in:
10002327 2024-08-30 18:05:41 +08:00
parent 5fdbceff47
commit ef5e9e23ae
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,26 +83,12 @@ public class PBomApi extends BaseApi {
List<String> materialNoList = Lists.newArrayList(); List<String> materialNoList = Lists.newArrayList();
List<String> facList = Lists.newArrayList(); List<String> facList = Lists.newArrayList();
// r.getRecords().forEach(bom -> {
// materialNoList.add(bom.getMaterialNo());
// facList.add(bom.getFacCode());
// if(CollectionUtil.isNotEmpty(bom.getChildNodes())){
// materialNoList.addAll(bom.getChildNodes().stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toList()));
// facList.addAll(bom.getChildNodes().stream().map(BomNewPbomParentVO::getFacCode).collect(Collectors.toList()));
// }
// });
this.get(r.getRecords(),materialNoList,facList); this.get(r.getRecords(),materialNoList,facList);
List<Map<String,Object>> lgproList = sapService.lgproByList(materialNoList,facList); List<Map<String,Object>> lgproList = sapService.lgproByList(materialNoList,facList);
Map<String,String> lgproMap = lgproList.stream().collect(Collectors.toMap(m-> { Map<String,String> lgproMap = lgproList.stream().collect(Collectors.toMap(m->
return String.valueOf(m.get("MATNR")) + String.valueOf(m.get("WERKS")); String.valueOf(m.get("MATNR")) + String.valueOf(m.get("WERKS"))
},m->String.valueOf(m.get("LGPRO")),(k1,k2)->k1)); ,m->String.valueOf(m.get("LGPRO")),(k1,k2)->k1));
this.set(r.getRecords(),lgproMap); this.set(r.getRecords(),lgproMap);
// r.getRecords().forEach(re -> {
// re.setLgpro(lgproMap.get(StrUtil.padPre(re.getMaterialNo(),18,"0") +re.getFacCode()));
// if(CollectionUtil.isNotEmpty(re.getChildNodes())){
// re.getChildNodes().forEach(cn -> cn.setLgpro(lgproMap.get(StrUtil.padPre(cn.getMaterialNo(),18,"0") +cn.getFacCode())));
// }
// });
} }
return ResultVO.success(r); return ResultVO.success(r);
@ -127,7 +113,6 @@ public class PBomApi extends BaseApi {
}); });
} }
@PostMapping("releaseListByPage") @PostMapping("releaseListByPage")
@ApiOperation("PBom已发布工作列表") @ApiOperation("PBom已发布工作列表")
public ResultVO<IPage<BomNewPbomParentVO>> releaseListByPage(@RequestBody BomNewPbomParentQuery query) { public ResultVO<IPage<BomNewPbomParentVO>> releaseListByPage(@RequestBody BomNewPbomParentQuery query) {