From 0d6bac74073e94d4bcde465cd350608f627d5050 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 13 Aug 2024 11:43:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistrilbutionBillStockMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index fe06932ad..ad08bce5d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -132,9 +132,10 @@ (select IFNULL(sum(quantity) ,0) from logpm_distribution_bill_lading_scan where stock_article_id = ldsa.id AND bill_lading_id = #{param.billLadingId} AND is_deleted = 0 ) pick_up_quantity, CASE ldsa.is_zero - WHEN 1 THEN IF(( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT IFNULL(quantity,0) FROM logpm_distribution_reservation_zero_package WHERE stock_article_id = ldsa.id AND zero_package_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(quantity,0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20')) + WHEN 1 THEN + IF(( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_reservation_zero_package WHERE stock_article_id = ldsa.id AND zero_package_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20')) ELSE - IF(( SELECT count( id ) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT count( id ) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(quantity,0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20')) + IF(( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT count( id ) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(sum( quantity ),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20')) END conditions, (select GROUP_CONCAT(DISTINCT ldpl.material_name ) from logpm_distribution_parcel_list ldpl From 8155ed8b5df5d47e8c57abb672ecb19d958a70fb Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 13 Aug 2024 11:56:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=87=E8=B4=A7BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionReservationMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 2bb3f8229..68e7b444a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -353,10 +353,12 @@ FROM logpm_warehouse_updown_goods lwug LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = lwug.association_id + LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id WHERE lwug.association_type != 4 AND ldpl.conditions = 2 AND ldpl.warehouse_id = #{warehouseId} + AND ldsa.mall_name = #{mallName} GROUP BY ldpl.material_code ) AS t1 ON t.cargo_number = t1.material_code