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-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java index 6a24089ef..98c08bbb8 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/job/SpiderDataJob.java @@ -76,9 +76,22 @@ public class SpiderDataJob { */ @XxlJob("factoryCarsData") public ReturnT factoryCarsData(String param) throws Exception { - startData =LocalDate.now().toString(); endData = LocalDate.now().minusDays(1).toString(); + + if(StringUtil.isNotBlank(param)){ + if(param.contains(",")){ + String[] split = param.split(","); + startData = split[0]; + endData = split[1]; + }else{ + startData = param; + endData = param; + } + } + + + // // startData ="2025-02-25"; // endData = "2025-02-27"; 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}