From ea3f180b3fff15315ba4a9e146dcbf0f4e995855 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 12 Nov 2024 14:27:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改配送明细报表查询导出逻辑 --- .../report/controller/ReportDeliveryController.java | 9 ++------- .../report/service/impl/ReportDeliverServiceImpl.java | 2 ++ .../main/java/com/logpm/report/vo/ReportDetailVO.java | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java index e39a1ecd6..75004f3b3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java @@ -124,13 +124,8 @@ public class ReportDeliveryController extends BladeController { @GetMapping("/exportDetails/v2") @ApiOperationSupport(order = 6) @ApiOperation(value = "导出配送明细报表v2", notes = "导出配送明细报表v2") - public R exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) { - try { - reportDeliverService.exportDetailsV3(response, query); - return R.success("导出成功"); - } catch (Exception e) { - return R.fail("导出失败，多仓权限最多只能导1周的数据，单仓权限最多只能导1个月的数"); - } + public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) { + reportDeliverService.exportDetailsV3(response, query); } @GetMapping("/stockOrder") diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index 64f4b31d9..088455872 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -455,6 +455,8 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) { IPage page = Condition.getPage(query); + page.setPages(1); + page.setSize(100000); if (StrUtil.isEmpty(query.getWarehouseNameRange())) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) { diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java index eb912f644..da758a352 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java @@ -29,10 +29,6 @@ public class ReportDetailVO implements Serializable { @ExcelProperty("车次") private String trainNumber; - @ApiModelProperty(value = "回库状态") - @ExcelProperty("回库状态") - private String returnToStockStatus; - @ApiModelProperty(value = "品牌") @ExcelProperty("品牌") private String brand; @@ -213,4 +209,8 @@ public class ReportDetailVO implements Serializable { @ExcelProperty("签收方式") private String signType; + @ApiModelProperty(value = "回库状态") + @ExcelProperty("回库状态") + private String returnToStockStatus; + }