From fcc0e9084045e30b57dd68a10e4309e36be80095 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 19 Jun 2024 10:43:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E7=BB=93=E7=AE=97=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=93=81=E7=B1=BBid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StatisticsDistributionPackageEntity.java | 6 ++++++ .../statistics/entity/StatisticsTrunklinePackageEntity.java | 6 ++++++ .../statistics/entity/StatisticsWarehousePackageEntity.java | 6 ++++++ .../logpm/statistics/listener/mq/WaybillFanoutListener.java | 3 +++ .../trunkline/service/impl/OpenOrderAsyncServiceImpl.java | 1 + 5 files changed, 22 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..2577923b8 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 @@ -84,6 +84,12 @@ public class StatisticsDistributionPackageEntity extends TenantEntity { @ApiModelProperty(value = "品类名称") private String productName; + /** + * 品类名称 + */ + @ApiModelProperty(value = "品类Id") + private String productId; + /** * 件数 */ 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..8bc83562d 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 @@ -83,6 +83,12 @@ public class StatisticsTrunklinePackageEntity extends TenantEntity { @ApiModelProperty(value = "品类名称") private String productName; + /** + * 品类名称 + */ + @ApiModelProperty(value = "品类id") + private String productId; + /** * 件数 */ 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..602534bce 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 @@ -84,6 +84,12 @@ public class StatisticsWarehousePackageEntity extends TenantEntity { @ApiModelProperty(value = "品类名称") private String productName; + /** + * 品类名称 + */ + @ApiModelProperty(value = "品类id") + private String productId; + /** * 件数 */ 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 2f7b5bd29..722c85dd7 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 @@ -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); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java index f6efb044a..9bdb50f13 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java +++ b/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());