From 6448477b43119f5c63b249b0760ebec71682e13b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 11 Jun 2024 17:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionStockupMapper.xml | 4 ++-- .../distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index a9329689c..17b249e8d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -1089,10 +1089,10 @@ SELECT COUNT(*) FROM logpm_distrilbution_bill_package dp WHERE dp.stock_article_id = ldbs.stock_article_id and dp.packet_bar_status in (1,3) and dp.packet_bar_code is - not null + not null AND dp.bill_lading_id = ldsi.reservation_id ) AS reservationNum from logpm_distribution_stockup_info ldsi - LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id and ldbs.order_status in (1,2) + LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id and ldbs.order_status in (1,3) LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldbs.stock_article_id INNER JOIN logpm_distribution_stockup lds ON lds.id = ldsi.stockup_id 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 6d9384253..9ab531427 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 @@ -693,7 +693,7 @@ LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldbp.parce_list_id LEFT JOIN logpm_distribution_stock_article dsa ON dbl.stock_article_id = dsa.id LEFT JOIN logpm_distribution_stockup_info ldsi on dbl.id = ldsi.reservation_id and ldsi.stock_up_type = #{distrilbutionBillLading.stockupType} - where ldsi.stockup_id = #{distrilbutionBillLading.id}; + where ldsi.stockup_id = #{distrilbutionBillLading.id} AND dbp.packet_bar_status != 2