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