diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index c8a3f3c5d..c4aa40f14 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3633,12 +3633,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName)); for (Map.Entry> entry : collect.entrySet()) { String brand = entry.getKey(); - List list = entry.getValue(); + List list2 = entry.getValue(); // 按订单分组 - Map> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode)); - for (Map.Entry> stringListEntry : collect1.entrySet()) { - String orderCode = stringListEntry.getKey(); - List list2 = stringListEntry.getValue(); +// Map> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode)); +// for (Map.Entry> stringListEntry : collect1.entrySet()) { +// String orderCode = stringListEntry.getKey(); +// List list2 = stringListEntry.getValue(); JSONObject js = new JSONObject(); js.put("boId", billLadingEntity.getId()); js.put("consignee", distrilbutionBillLadingEntity.getConsignee()); @@ -3662,7 +3662,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl