|
@@ -378,8 +378,10 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
.collect(Collectors.toMap(BaseIdPo::getId, Department::getPriceBillingStandardId));
|
|
|
|
|
|
// 加工计费标准id 报价规则列表 map
|
|
|
- Map<Long, List<PriceBillingStandardDetail>> priceBillingStandardMap = priceBillingStandardDetailService.list()
|
|
|
- .stream().collect(Collectors.groupingBy(PriceBillingStandardDetail::getPriceBillingStandardId));
|
|
|
+ Map<Long, List<PriceBillingStandardDetail>> priceBillingStandardMap =
|
|
|
+ priceBillingStandardDetailService.list().stream()
|
|
|
+ .filter(item -> ObjectUtil.isNotNull(item.getPriceBillingStandardId()))
|
|
|
+ .collect(Collectors.groupingBy(PriceBillingStandardDetail::getPriceBillingStandardId));
|
|
|
|
|
|
// 根据sku规格id获取bomId和bom规格id
|
|
|
Map<Long, BomBo> bomBoMap = skuSpecService.getBomBoByIdList(
|