From e32a247071248a4fe2b0da850c00944e2eb79e0e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 23 Aug 2024 11:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=A2=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 3 +-- .../service/impl/DistributionReservationServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 3 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 6e224947f..1b6ce78c4 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 @@ -740,7 +740,6 @@ ldsa.service_number, ldsa.order_code, ldsa.mall_id, ldsa.mall_code, ldsa.mall_name, ldsa.store_name, ldsa.store_code, ldsa.store_id, ldsa.description_goods, ldsa.warehouse_id, - ldsa.warehouse, ldsa.warehouse_entry_time, ldsa.store_time, ldsa.total_number, ldsa.complete_set, ldsa.brand, ldsa.type_service, ldsa.customer_name, ldsa.customer_telephone, ldsa.customer_address, ldsa.genre, @@ -768,7 +767,7 @@ FROM logpm_distribution_parcel_list ldpll WHERE ldsa.id = ldpll.stock_article_id - + AND ldpll.is_transfer = 0 AND ldpll.order_package_loading_status != '20' AND ldpll.order_package_reservation_status != '20' AND ldpll.order_package_status != '70' diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index cf8b7687c..1e8e2cbf5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -1518,7 +1518,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl