|
@@ -2,6 +2,7 @@ package com.fjhx.purchase.service.sales.impl;
|
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
import com.fjhx.item.entity.product.vo.ProductInfoVo;
|
|
@@ -74,13 +75,16 @@ public class SalesReturnDetailServiceImpl extends ServiceImpl<SalesReturnDetailM
|
|
|
Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
|
|
|
if(MapUtils.isNotEmpty(productMap)) {
|
|
|
for(SalesReturnDetailVo s:list){
|
|
|
- ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
|
|
|
- s.setProductCategory(p.getClassifyName());
|
|
|
- s.setProductCode(p.getCode());
|
|
|
- s.setProductUnit(p.getUnit());
|
|
|
- s.setProductType(p.getType());
|
|
|
- s.setProductName(p.getName());
|
|
|
- s.setProductSpec(p.getSpec());
|
|
|
+ List<ProductInfoVo> ps = productMap.get(s.getBussinessId());
|
|
|
+ if(CollectionUtils.isNotEmpty(ps)){
|
|
|
+ ProductInfoVo p = ps.get(0);
|
|
|
+ s.setProductCategory(p.getClassifyName());
|
|
|
+ s.setProductCode(p.getCode());
|
|
|
+ s.setProductUnit(p.getUnit());
|
|
|
+ s.setProductType(p.getType());
|
|
|
+ s.setProductName(p.getName());
|
|
|
+ s.setProductSpec(p.getSpec());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|