From 2098dbf611308d3556a3c668fbe22011d2e167fc Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 17 Dec 2024 16:34:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 整体优化配送明细报表广播消息 --- .../common/constant/report/ReportConstants.java | 15 ++++++++++++--- .../common/model/workNode/PickUpByScanVO.java | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/report/ReportConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/report/ReportConstants.java index 6a1d0f61b..3120432f0 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/report/ReportConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/report/ReportConstants.java @@ -1,5 +1,7 @@ package org.springblade.common.constant.report; +import org.springblade.common.constant.ModuleNameConstant; + /** * excel处理常量类 * @@ -11,8 +13,15 @@ public class ReportConstants { /** * 配送明细报表 */ - public static final String REPORT_QUALITY_DELIVER_EXCHANGE = "report.quality.deliver.exchange"; - public static final String REPORT_QUALITY_DELIVER_QUEUE = "report.quality.deliver.queue"; - public static final String REPORT_QUALITY_DELIVER_ROUTINGKEY = "report.quality.deliver.key"; + public static final String REPORT_QUALITY_DELIVER_EXCHANGE = "report.quality.deliver.exchange" + ModuleNameConstant.DEVAUTH; + public static final String REPORT_QUALITY_DELIVER_QUEUE = "report.quality.deliver.queue" + ModuleNameConstant.DEVAUTH; + public static final String REPORT_QUALITY_DELIVER_ROUTINGKEY = "report.quality.deliver.key" + ModuleNameConstant.DEVAUTH; + + /** + * 车辆车次报表 + */ + public static final String REPORT_QUALITY_CAR_FINAL_EXCHANGE = "report.quality.car.final.exchange" + ModuleNameConstant.DEVAUTH; + public static final String REPORT_QUALITY_CAR_FINAL_QUEUE = "report.quality.car.final.queue" + ModuleNameConstant.DEVAUTH; + public static final String REPORT_QUALITY_CAR_FINAL_ROUTINGKEY = "report.quality.car.final.key" + ModuleNameConstant.DEVAUTH; } diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java index 60dcfc791..c04c64737 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/workNode/PickUpByScanVO.java @@ -29,6 +29,11 @@ public class PickUpByScanVO { */ private String driverName; + /** + * 签收类型 + */ + private String signType; + /** * 配送时间 */