BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：生产需求列表返回面料和内里材质报错BUG修复；

pull/1121/head
liujiang 2025-11-25 00:01:39 +08:00
parent 4a1d5330bc
commit bdd08c7e4e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
View File

@ -199,12 +199,12 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
List<StoreProductColor> prodColorList = this.storeProdColorMapper.selectList(new LambdaQueryWrapper<StoreProductColor>() List<StoreProductColor> prodColorList = this.storeProdColorMapper.selectList(new LambdaQueryWrapper<StoreProductColor>()
.in(StoreProductColor::getId, demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdColorId).distinct().collect(Collectors.toList()))); .in(StoreProductColor::getId, demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdColorId).distinct().collect(Collectors.toList())));
Map<Long, String> liningMaterialMap = CollectionUtils.isEmpty(prodColorList) ? new HashMap<>() Map<Long, String> liningMaterialMap = CollectionUtils.isEmpty(prodColorList) ? new HashMap<>()
: prodColorList.stream().collect(Collectors.toMap(StoreProductColor::getId, StoreProductColor::getShoeUpperLiningMaterial)); : prodColorList.stream().collect(Collectors.toMap(StoreProductColor::getId, StoreProductColor::getShoeUpperLiningMaterial, (v1, v2) -> v2));
// 查询面料材质 // 查询面料材质
List<StoreProductCategoryAttribute> prodCateAttrList = this.prodCateAttrMapper.selectList(new LambdaQueryWrapper<StoreProductCategoryAttribute>() List<StoreProductCategoryAttribute> prodCateAttrList = this.prodCateAttrMapper.selectList(new LambdaQueryWrapper<StoreProductCategoryAttribute>()
.in(StoreProductCategoryAttribute::getStoreProdId, demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdId).distinct().collect(Collectors.toList()))); .in(StoreProductCategoryAttribute::getStoreProdId, demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdId).distinct().collect(Collectors.toList())));
Map<Long, String> shaftMaterialMap = CollectionUtils.isEmpty(prodCateAttrList) ? new HashMap<>() Map<Long, String> shaftMaterialMap = CollectionUtils.isEmpty(prodCateAttrList) ? new HashMap<>()
: prodCateAttrList.stream().collect(Collectors.toMap(StoreProductCategoryAttribute::getStoreProdId, StoreProductCategoryAttribute::getShaftMaterial)); : prodCateAttrList.stream().collect(Collectors.toMap(StoreProductCategoryAttribute::getStoreProdId, StoreProductCategoryAttribute::getShaftMaterial, (v1, v2) -> v2));
// 提取需求详情ID列表，用于后续查询抵扣信息 // 提取需求详情ID列表，用于后续查询抵扣信息
List<Long> demandDetailIdList = demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdDemandDetailId).distinct().collect(Collectors.toList()); List<Long> demandDetailIdList = demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdDemandDetailId).distinct().collect(Collectors.toList());
// 找到需求单抵扣的数据 // 找到需求单抵扣的数据