From 90a4f7e0ee4beffade57e6f6a7c6c9202b38df2b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 7 Apr 2024 14:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=99=E5=B1=95=E7=A4=BA=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BA=BA=E3=80=81=E6=94=B6=E8=B4=A7=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index d5fabdffe..ae1b8dd7e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -433,7 +433,7 @@
                GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_person))      AS customerName,
                GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_mobile)) AS customerTelephone
         FROM logpm_distrilbution_bill_lading ldbl
-                 LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id
+                 LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id AND order_status != '2'
                  LEFT JOIN logpm_distribution_stock_article ldsa ON ldbs.stock_article_id = ldsa.id
         WHERE ldbl.id = #{id}
         GROUP BY ldbl.id;