From 7b9fb8cc69d427994ac89425c744a1a21dad4862 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 11 May 2024 02:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=87=E6=B3=A8=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.xml          |  3 +++
 .../mapper/DistrilbutionBillLadingMapper.xml           | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index a4a151ded..a4ee0e5a6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -653,6 +653,9 @@
             <if test="par.mallName != null and par.mallName != '' ">
                 and ldsa.mall_name like concat('%',#{par.mallName},'%')
             </if>
+            <if test="par.mallId != null and par.mallId != '' ">
+                and ldsa.mall_id = #{par.mallId}
+            </if>
             <if test="par.storeName != null and par.storeName != '' ">
                 and ldsa.store_name like concat('%',#{par.storeName},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 17dbf5c05..7d512f679 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -555,8 +555,14 @@
     </select>
 
     <select id="getDetailOne" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO">
-        select lad.id,lad.pick_up_time ,lad.consignee ,lad.pick_up_plate ,lad.delivery_document ,lad.certificate_type
-        ,lad.total_cost
+        select lad.id,
+        lad.pick_up_time ,
+        lad.consignee ,
+        lad.pick_up_plate ,
+        lad.delivery_document ,
+        lad.certificate_type ,
+        lad.total_cost,
+        lad.remark
         from logpm_distrilbution_bill_lading lad
         <where>
             lad.id = #{id}