From fb30d7d1414f528b1cb5022dccf73e379392e5e0 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 3 Jun 2024 18:24:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistrilbutionBillLadingServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 97b0e8dfd..d98790833 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3153,8 +3153,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl>>> {}", parcelListEntity); + log.debug("getScan so >>>> {}", so); + log.debug("getScan coding >>>> {}", coding); if (parcelListEntity.getStockArticleId().equals(so.getStockArticleId()) && parcelListEntity.getOrderPackageCode().equals(coding)) { distributionParcelListEntity = parcelListEntity; + break; } } From 2a134e9de4b970c8946d741148c202f7e5ba9d85 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 3 Jun 2024 18:36:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.c=E6=9F=A5=E8=AF=A2=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index cfb56e86f..e240d4576 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -365,7 +365,7 @@ ldsa.total_number totalNum, count(ldpl.id) num FROM logpm_distribution_stock_article ldsa - left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code + left join logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3 left join logpm_warehouse_updown_goods lwug @@ -388,7 +388,7 @@ ldsa.total_number totalNum, count(ldpl.id) num FROM logpm_distribution_stock_article ldsa - left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code + left join logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3 left join logpm_warehouse_updown_goods lwug