在库订单区分商家端和物流订单查询

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

@@ -2284,15 +2284,12 @@
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
-        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.order_code = ltwo.order_code
-        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.waybill_no = ltwo.waybill_no
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
             AND EXISTS (
             SELECT 1
             FROM logpm_distribution_parcel_list ldpll
-            LEFT JOIN logpm_warehouse_waybill AS lww ON ldpll.waybill_number = lww.waybill_no AND lww.is_deleted = 0
             WHERE
             ldsa.id = ldpll.stock_article_id
             AND ldpll.is_transfer = 0
@@ -2302,7 +2299,6 @@
             AND ldpll.conditions != 2
             AND ldpll.warehouse_id = #{par.warehouseId}
             AND ldsa.type_service = #{par.typeService}
-            AND IFNULL(lww.abolish_status,0) = 0
             <if test="par.orderCode != null and par.orderCode != '' ">
                 and ldpll.order_code like concat('%',#{par.orderCode},'%')
             </if>