From 97d8292dd8b9033b5b8717af197d64118b190951 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 23 Oct 2024 03:13:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 2 +- .../impl/OrderPackageStatusPushFailLogServiceImpl.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 8669e0f76..e0a26adbe 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 @@ -546,7 +546,7 @@ ldsa.stockup_status, ldsa.reservation_status, ldsa.order_status, ldsa.grounding_status, ldsa.order_receive_status, ldsa.freeze_status, ldsa.notification, ldsa.fee, ldsa.rate, ldsa.advance_id, ldsa.waybill_id, - ldpl.waybill_number + group_concat( DISTINCT ldpl.waybill_number ) AS waybillNumber, ldsa.consignee_unit, ldsa.collect_fee, ldsa.storage_fee, ldsa.consignee_person, ldsa.consignee_address, ldsa.consignee_mobile, ldsa.warehouse_entry_time_end, ldsa.sorting_quantity, ldsa.delivery_quantity, ldsa.transfer_quantity, diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java index c9cabed99..e2442e083 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; import java.util.List; @@ -20,6 +21,12 @@ public class OrderPackageStatusPushFailLogServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>> 没有仓库信息 不进行记录"); + return ; + } + QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("unit_no", unitNo); queryWrapper.eq("warehouse_id", currentWarehouseId);