diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java index 3c79e1f0..cf3e1824 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java @@ -83,26 +83,12 @@ public class PBomApi extends BaseApi { List materialNoList = Lists.newArrayList(); List 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); List> lgproList = sapService.lgproByList(materialNoList,facList); - Map lgproMap = lgproList.stream().collect(Collectors.toMap(m-> { - return String.valueOf(m.get("MATNR")) + String.valueOf(m.get("WERKS")); - },m->String.valueOf(m.get("LGPRO")),(k1,k2)->k1)); + Map lgproMap = lgproList.stream().collect(Collectors.toMap(m-> + String.valueOf(m.get("MATNR")) + String.valueOf(m.get("WERKS")) + ,m->String.valueOf(m.get("LGPRO")),(k1,k2)->k1)); 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); @@ -127,7 +113,6 @@ public class PBomApi extends BaseApi { }); } - @PostMapping("releaseListByPage") @ApiOperation("PBom已发布工作列表") public ResultVO> releaseListByPage(@RequestBody BomNewPbomParentQuery query) {