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 @@ and order_code = #{query.stockArticleId} + + and brand_name = #{query.brandName} + and order_package_code = #{query.orderPackageCode} 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; + }