From 8b370709538fbde3724b2e5068ae5e2f80117e12 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 9 Sep 2024 11:25:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=A4=8D=E6=A0=B8=E6=8C=89=E7=85=A7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E7=9A=84=E8=8A=82=E7=82=B9=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistrilbutionBillLadingServiceImpl.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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<Distrilb
 							Map<String, List<DistributionParcelListEntity>> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
 							for (Map.Entry<String, List<DistributionParcelListEntity>> entry : collect.entrySet()) {
 								String brand = entry.getKey();
-								List<DistributionParcelListEntity> list = entry.getValue();
+								List<DistributionParcelListEntity> list2 = entry.getValue();
 								// 按订单分组
-								Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
-								for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) {
-									String orderCode = stringListEntry.getKey();
-									List<DistributionParcelListEntity> list2 = stringListEntry.getValue();
+//								Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
+//								for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) {
+//									String orderCode = stringListEntry.getKey();
+//									List<DistributionParcelListEntity> 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<Distrilb
 									factoryDataMessageSender.sendNodeDataByBrand(msg);
 								}
 							}
-						}
 					}catch (Exception e){
 						log.error("推送失败：{}", e);
 					}
@@ -3709,7 +3708,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				handletrunklineWaybillSignLog(billLadingEntity.getId());
 			}
 		// 回传工厂数据
-		sendFactory(myCurrentWarehouse, parcelListIds);
+//		sendFactory(myCurrentWarehouse, parcelListIds);
 
 		return R.success("操作成功");
 	}