Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -455,8 +455,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		if (!list1.isEmpty()) {
 			Set<Long> listString = new HashSet<>();
 			log.info("###############包件信息>>>>>>>>>>>>,{}",list1);
-			list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId))
-				.forEach((k, v) -> {
+			Map<Long, List<DistributionParcelListEntity>> listMap = list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId));
+			log.info("###############包件信息listMap>>>>>>>>>>>>,{}",listMap);
+
+			listMap.forEach((k, v) -> {
 					int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 					List<Long> packageIds = new ArrayList<>();
 					v.stream().forEach(i -> {