|
|
@ -477,7 +477,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
String warehouseAddress = ""; |
|
|
|
String warehouseAddress = ""; |
|
|
|
if (CollUtil.isNotEmpty(brands)) { |
|
|
|
if (CollUtil.isNotEmpty(brands)) { |
|
|
|
// 按品牌分组
|
|
|
|
// 按品牌分组
|
|
|
|
Map<String, List<LoadScanBrandDTO>> brandMap = brands.stream().collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand)); |
|
|
|
Map<String, List<LoadScanBrandDTO>> brandMap = brands.stream().filter(b -> StringUtil.isNotBlank(b.getBrand())).collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand)); |
|
|
|
for (Map.Entry<String, List<LoadScanBrandDTO>> entry : brandMap.entrySet()) { |
|
|
|
for (Map.Entry<String, List<LoadScanBrandDTO>> entry : brandMap.entrySet()) { |
|
|
|
List<LoadScanBrandDTO> value = entry.getValue(); |
|
|
|
List<LoadScanBrandDTO> value = entry.getValue(); |
|
|
|
LoadScanBrandDTO brand = value.get(0); |
|
|
|
LoadScanBrandDTO brand = value.get(0); |
|
|
|