From 0ebb14ec6f7015cdb32f8516e55cb9eb99467db4 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Apr 2024 12:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E8=BD=A6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E6=9F=A5=E8=AF=A2=E8=A3=85=E8=BD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index f587d0e6f..5d2097cdf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -109,7 +109,7 @@
         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_signfor AS lds ON lds.reservation_id = ldr.id
-        LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id  and ldl.scan_status !=1
+        LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id  and ldl.scan_status !=1 AND ldl.is_deleted = 0
         LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
         left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_distrilbution_bill_package AS ldbp ON ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status != 2