From 24af59685b0520fc7e642f7c2e946d4fd39c840d Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期三, 30 十月 2024 14:22:12 +0800 Subject: [PATCH] 新增物料库存报表 --- north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java index 7c03533..dbd855f 100644 --- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java +++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java @@ -164,16 +164,16 @@ @ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛") @SaCheckPermission("warehouseReport.search") - @PostMapping("/getSelectFinishedOperateLogReport/{pageNum}/{pageSize}/{selectDate}") - public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){ - return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog)); + @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}") + public Result getSelectFinishedOperateLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){ + return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog)); } @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭") - @PostMapping("/exportFinishedOperateLogReport") - public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException { + @PostMapping("/exportFinishedOperateLogReport/{type}") + public void exportFinishedOperateLogReport(@PathVariable String type,HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException { //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧 - DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport"); + DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates,type),"orderReport"); } -- Gitblit v1.8.0