From 170c89b9b8e6d5c3117d53e7b38f782651ebfcde Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 14:04:04 +0800
Subject: [PATCH] 物品统计表中总数量改为在库数量+报废数量
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index ab16dde..269ad76 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -70,7 +70,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -208,14 +208,14 @@
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
formOutputQry.setAgencyId(Long.valueOf(currentUser.getTenantId()));
- PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry);
+ PageUtil genericPager = lWarehouseFlowServiceImpl.queryAllBusinessFlow(formOutputQry);
return ResponseValue.success(genericPager);
}
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public String export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue export(Long id, HttpServletResponse response) throws Exception {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -251,7 +251,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- return downLoadExcel("鍑哄簱鍗�", response, workbook);
+ String filePath = downLoadExcel("鍑哄簱鍗�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1