From 0cf0087e2fba8407214f1daf828f2a216fa9d08c Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 17 Jun 2024 15:36:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=93=81=E7=89=8Cid=E5=92=8C=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E4=BD=8Did=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/StatisticsDistributionPackageEntity.java  | 12 ++++++++++++
 .../entity/StatisticsTrunklinePackageEntity.java     | 12 ++++++++++++
 .../entity/StatisticsWarehousePackageEntity.java     | 12 ++++++++++++
 .../listener/mq/WaybillFanoutListener.java           |  6 ++++++
 4 files changed, 42 insertions(+)

diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java
index cd08e40ca..479757f54 100644
--- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java
+++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java
@@ -42,6 +42,18 @@ public class StatisticsDistributionPackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+	/**
+	 * 品牌id
+	 */
+	@ApiModelProperty(value = "品牌id")
+	private Long brandId;
+
+	/**
+	 * 收货单位id
+	 */
+	@ApiModelProperty(value = "收货单位id")
+	private Long consigneeId;
+
 	/**
 	 * 仓库id
 	 */
diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java
index 47090521e..c89e4de46 100644
--- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java
+++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java
@@ -53,6 +53,18 @@ public class StatisticsTrunklinePackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "仓库名称")
 	private String warehouseName;
 
+	/**
+	 * 品牌id
+	 */
+	@ApiModelProperty(value = "品牌id")
+	private Long brandId;
+
+	/**
+	 * 收货单位id
+	 */
+	@ApiModelProperty(value = "收货单位id")
+	private Long consigneeId;
+
 	/**
 	 * 运单id
 	 */
diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java
index 72af3167a..b06105f67 100644
--- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java
+++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java
@@ -42,6 +42,18 @@ public class StatisticsWarehousePackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+	/**
+	 * 品牌id
+	 */
+	@ApiModelProperty(value = "品牌id")
+	private Long brandId;
+
+	/**
+	 * 收货单位id
+	 */
+	@ApiModelProperty(value = "收货单位id")
+	private Long consigneeId;
+
 	/**
 	 * 仓库id
 	 */
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java
index 941f6db4d..d347ce8bc 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java
@@ -72,6 +72,8 @@ public class WaybillFanoutListener {
 
 			//干线
 			StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity();
+			statisticsTrunklinePackageEntity.setBrandId(brandId);
+			statisticsTrunklinePackageEntity.setConsigneeId(consigneeId);
 			statisticsTrunklinePackageEntity.setWarehouseId(warehouseId);
 			statisticsTrunklinePackageEntity.setWarehouseName(warehouseName);
 			statisticsTrunklinePackageEntity.setTypeService(typeService);
@@ -120,6 +122,8 @@ public class WaybillFanoutListener {
 
 			//仓库
 			StatisticsWarehousePackageEntity statisticsWarehousePackageEntity = new StatisticsWarehousePackageEntity();
+			statisticsWarehousePackageEntity.setBrandId(brandId);
+			statisticsWarehousePackageEntity.setConsigneeId(consigneeId);
 			statisticsWarehousePackageEntity.setWarehouseId(warehouseId);
 			statisticsWarehousePackageEntity.setWarehouseName(warehouseName);
 			statisticsWarehousePackageEntity.setTypeService(typeService);
@@ -155,6 +159,8 @@ public class WaybillFanoutListener {
 
 			//配送
 			StatisticsDistributionPackageEntity statisticsDistributionPackageEntity = new StatisticsDistributionPackageEntity();
+			statisticsDistributionPackageEntity.setBrandId(brandId);
+			statisticsDistributionPackageEntity.setConsigneeId(consigneeId);
 			statisticsDistributionPackageEntity.setWarehouseId(warehouseId);
 			statisticsDistributionPackageEntity.setWarehouseName(warehouseName);
 			statisticsDistributionPackageEntity.setTypeService(typeService);