自提备注修复

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>

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}