From be463ad770d876aaa19190571d5cf6574b661577 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 1 Feb 2024 18:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86SQL?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionParcelListMapper.java | 2 +- .../logpm/distribution/mapper/DistributionParcelListMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 17a53e89f..ce08b9eb9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -44,7 +44,7 @@ public interface DistributionParcelListMapper extends BaseMapper selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList); + List selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList); int submitNumByOrderIdAndName(@Param("articleId") Long articleId,@Param("productName") String productName, @Param("num") Integer num); 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 9aab6aacc..746f519df 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 @@ -158,7 +158,8 @@ LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.scan_status !=1 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_lading ldbl on ldsa.id = ldpl.stock_article_id + LEFT JOIN logpm_distribution_bill_package AS ldbp ON ldbp.parce_list_id = ldpl.id + LEFT JOIN logpm_distrilbution_bill_lading ldbl ON ldbl.id = ldbp.bill_lading_id ldpl.is_deleted = 0