已签订单日志增加

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -1260,10 +1260,10 @@
             and ldsa.order_status in ('70','80')
 
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
-                and ldsa.warehouse_id in
+<!--                and ldsa.warehouse_id in-->
-                <foreach collection="collect" item="item" open="(" close=")" separator=",">
+<!--                <foreach collection="collect" item="item" open="(" close=")" separator=",">-->
-                    #{item}
+<!--                    #{item}-->
-                </foreach>
+<!--                </foreach>-->
                 and ldl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
                     #{item}
@@ -1386,6 +1386,10 @@
         LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbls.bill_lading_id = ldbl.id
         <where>
             ldsa.order_status in ('70','80')
+            and ldbls.warehouse_id in
+            <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
             <if test="param.waybillNumber != null and param.waybillNumber != ''">
                 AND ldsa.waybill_number like concat(#{param.waybillNumber},"%")
             </if>