From b35b4294815d2f281af0f968b9b707d2fbf569c7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 12 Apr 2024 11:04:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E9=9B=B6=E6=8B=85=E9=85=8D=E9=80=81=E5=8D=95=E5=AD=90=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 6fc72d26b..1ef2ad855 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
@@ -625,10 +625,13 @@
         WHERE ldpll.order_package_loading_status != '20'
             AND ldpll.order_package_reservation_status !='20'
             AND ldpll.order_package_status != '70'
-        AND ldpll.conditions = 1
+        AND ldpll.conditions != 2
         AND ldsaa.warehouse_id = #{par.warehouseId}
         AND ldpll.warehouse_id = #{par.warehouseId}
         AND ldsaa.type_service = #{par.typeService}
+        <if test="par.orderCode != null and par.orderCode != '' ">
+            and ldsaa.order_code like concat(#{par.orderCode},'%')
+        </if>
             GROUP BY ldsaa.id
         )
         AS t ON t.id = ldsa.id