From e19d9742d5d14823bc414b1d1d47778b3daee227 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 09:24:56 +0800
Subject: [PATCH] 盘点时库存查询不分仓库类型
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 0784857..f485cc4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -140,8 +140,6 @@
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- // fieldDatas.setAccessible(true);
- // fieldDatas.set(genericPager, result);
ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
e.printStackTrace();
@@ -276,11 +274,11 @@
CommonUtil.copyProperties(formProcureQry, param2);
formProcureQry = param2;
- S_user_core currentUser = this.getCurrentUser();
- if (currentUser == null) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
+ formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
@@ -289,7 +287,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "閲囪喘鍗昳d", required = true, dataType = "Long", paramType = "query")})
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
TemplateExportParams params = new TemplateExportParams("import/閲囪喘鍏ュ簱鍗�.xls");
params.setHeadingStartRow(2);
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -320,7 +318,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
- downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
--
Gitblit v1.9.1