From afc23cd6a98b87277fd54bef13d4d1fa769b79ae Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 9 Dec 2024 16:58:09 +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 增加品牌字段查询
---
 .../main/java/com/logpm/report/mapper/ReportDeliverMapper.xml  | 3 +++
 .../main/java/com/logpm/report/query/DevilerDetailsQuery.java  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
index 612fe16e7..5ff5845d0 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
@@ -980,6 +980,9 @@
             <if test="query.stockArticleId != null and query.stockArticleId != null">
                 and order_code = #{query.stockArticleId}
             </if>
+            <if test="query.brandName != null and query.brandName != null">
+                and brand_name = #{query.brandName}
+            </if>
             <if test="query.orderPackageCode != null and query.orderPackageCode != null">
                 and order_package_code = #{query.orderPackageCode}
             </if>
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java b/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java
index 1ad4da04c..3c5045165 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java
@@ -62,4 +62,7 @@ public class DevilerDetailsQuery extends Query {
 	@ApiModelProperty(value = "包条码")
 	private String orderPackageCode;
 
+	@ApiModelProperty(value = "品牌")
+	private String brandName;
+
 }