1.商家端订单号模糊搜索

2.滞留后取消订单包间和预约的查询关联

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

@@ -153,7 +153,7 @@
         left join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id  and ldrp.packet_bar_status in (1,3)
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id
-        LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2
+        LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2 and ldl.scan_status !=1
         LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id
         <where>
             ldpl.is_deleted = 0

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

@@ -74,7 +74,7 @@
         SELECT * from logpm_distribution_stock_article ldsa where
         ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1  and ldsa.reservation_status in ('10','20') and ldsa.order_status in ('10','20','30')
         <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
-            and ldsa.order_code = #{distributionStockArticleVO.orderCode}
+            and ldsa.order_code  like concat(#{distributionStockArticleVO.orderCode},'%')
         </if>
         <if test="distributionStockArticleVO.stockupStatus != null and distributionStockArticleVO.stockupStatus != ''">
             and ldsa.stockup_status = #{distributionStockArticleVO.stockupStatus}