From 17046917c3dc1d45d3f70e699a3c0f6e3fde143d Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 17 Aug 2024 11:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8D=95=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistrilbutionBillLadingServiceImpl.java   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 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 435724849..b23057a23 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
@@ -3607,19 +3607,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						//存在资源释放操作
 						distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId());
 					}
-					parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
 					try {
-						List<DistributionParcelListEntity> listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId());
-						// 根据品牌分组
-						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();
-							// 按订单分组
-							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();
+						if (sum > 0){
+							parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
+							List<DistributionParcelListEntity> listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId());
+							// 根据品牌分组
+							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();
+								// 按订单分组
+								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());
@@ -3641,6 +3642,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 									msg.setMain(JSONUtil.toJsonStr(js));
 									log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
 									factoryDataMessageSender.sendNodeDataByBrand(msg);
+								}
 							}
 						}
 					}catch (Exception e){