From 9b776094105364fc2277cc511a9c3ae77ba0bc74 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 20 Mar 2025 15:56:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8A=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/feign/IDistributionParcelListClient.java | 2 +- .../main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 4100a3beb..f14698c01 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -327,7 +327,7 @@ public interface IDistributionParcelListClient { @PostMapping(API_PREFIX + "/findListZhaoBuDaoYuanYin") List findListZhaoBuDaoYuanYin(@RequestBody FindParamterDTO findParamterD); - @PostMapping(API_PREFIX + "/findListByOrderPackageCodeAndStatusAndNoWarehouseId") + @GetMapping(API_PREFIX + "/findListByOrderPackageCodeAndStatusAndNoWarehouseId") List findListByOrderPackageCodeAndStatusAndNoWarehouseId(@RequestParam String orderPackageCode, @RequestParam String number, @RequestParam Long warehouseId); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml index c99d6ca97..0d33820eb 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml @@ -218,6 +218,7 @@ logpm_distribution_delivery_list is_deleted = 0 + AND YEAR(create_time) = YEAR(CURDATE()) AND type IS NOT NULL AND kind = 1 @@ -258,6 +259,7 @@ LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id AND lds.is_deleted = 0 LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id AND lddl.is_deleted = 0 + YEAR(ldr.create_time) = YEAR(CURDATE()) and ldr.reservation_status != 40 AND ldr.is_deleted = 0 AND ldr.delivery_type = #{type}