feat(all): 结算明细增加品类id字段

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsDistributionPackageEntity.java

@@ -84,6 +84,12 @@ public class StatisticsDistributionPackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "品类名称")
 	private String productName;
 
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类Id")
+	private String productId;
+
 	/**
 	 * 件数
 	 */

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsTrunklinePackageEntity.java

@@ -83,6 +83,12 @@ public class StatisticsTrunklinePackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "品类名称")
 	private String productName;
 
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类id")
+	private String productId;
+
 	/**
 	 * 件数
 	 */

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsWarehousePackageEntity.java

@@ -84,6 +84,12 @@ public class StatisticsWarehousePackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "品类名称")
 	private String productName;
 
+	/**
+	 * 品类名称
+	 */
+	@ApiModelProperty(value = "品类id")
+	private String productId;
+
 	/**
 	 * 件数
 	 */

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java

@@ -87,6 +87,7 @@ public class WaybillFanoutListener {
 			statisticsTrunklinePackageEntity.setOrderCode(json.getStr("orderCode"));
 			statisticsTrunklinePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
 			statisticsTrunklinePackageEntity.setProductName(json.getStr("productName"));
+			statisticsTrunklinePackageEntity.setProductId(json.getStr("productId"));
 			statisticsTrunklinePackageEntity.setTotalNum(json.getInt("totalNum"));
 			statisticsTrunklinePackageEntity.setTotalWeight(totalWeight);
 			statisticsTrunklinePackageEntity.setTotalVolume(totalVolume);
@@ -135,6 +136,7 @@ public class WaybillFanoutListener {
 			statisticsWarehousePackageEntity.setOrderCode(json.getStr("orderCode"));
 			statisticsWarehousePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
 			statisticsWarehousePackageEntity.setProductName(json.getStr("productName"));
+			statisticsWarehousePackageEntity.setProductId(json.getStr("productId"));
 			statisticsWarehousePackageEntity.setTotalNum(json.getInt("totalNum"));
 			statisticsWarehousePackageEntity.setTotalWeight(totalWeight);
 			statisticsWarehousePackageEntity.setTotalVolume(totalVolume);
@@ -170,6 +172,7 @@ public class WaybillFanoutListener {
 			statisticsDistributionPackageEntity.setOrderCode(json.getStr("orderCode"));
 			statisticsDistributionPackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
 			statisticsDistributionPackageEntity.setProductName(json.getStr("productName"));
+			statisticsDistributionPackageEntity.setProductId(json.getStr("productId"));
 			statisticsDistributionPackageEntity.setTotalNum(json.getInt("totalNum"));
 			statisticsDistributionPackageEntity.setTotalWeight(totalWeight);
 			statisticsDistributionPackageEntity.setTotalVolume(totalVolume);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java

@@ -552,6 +552,7 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 				json.put("orderPackageCode",detail.getProductName());
 				json.put("orderCode",waybillNo);
 				json.put("productName",detail.getProductName());
+				json.put("productId",detail.getProductId());
 				json.put("totalNum",num);
 				json.put("totalWeight",detail.getWeight());
 				json.put("totalVolume",detail.getVolume());