From 017558305e995906b20a64e87e5fa0c494d29027 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 19 Apr 2024 16:17:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=87=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.xml             | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 11f75f72c..2b166bf28 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
@@ -841,12 +841,12 @@
                group_concat(DISTINCT lwt.pallet_name)    as trays,
                group_concat(DISTINCT lwug.position_code)  as allocation
         from logpm_platform.logpm_distribution_stock_article ldsa
-                 left join logpm_platform.logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id and ldpl.tenant_id = '627683'
+                 left join logpm_platform.logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
                  left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
                  left join logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
                 left JOIN logpm_warehouse_tray lwt on lwtg.tray_id= lwt.id
         <where>
-            ldsa.is_deleted = 0 and ldsa.order_status != '80'
+            ldsa.is_deleted = 0 and ldsa.order_status IN ( 10, 20, 30, 40, 50, 60, 70 )
             <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
                 and ldsa.warehouse_id = #{paramMap.warehouseId}
             </if>
@@ -859,9 +859,7 @@
             <if test="paramMap.trainNumber != null and paramMap.trainNumber != ''">  and ldsa.train_number = #{paramMap.trainNumber}  </if>
             <if test="paramMap.acceptWarehouseName != null and paramMap.acceptWarehouseName != ''">  and ldsa.accept_warehouse_name = #{paramMap.acceptWarehouseName}  </if>
 
-            <if test="paramMap.tenantId != null and paramMap.tenantId != ''">
-                and ldsa.tenant_id = #{paramMap.tenantId}
-            </if>
+
             <if test="paramMap.serviceNumber != null and paramMap.serviceNumber != ''">
                 and ldsa.servic_nNumber = #{paramMap.serviceNumber}
             </if>