From 0fdac321828bffa833f7d0155a5c147d23bd78d8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 12:26:25 +0800
Subject: [PATCH] 1.修改调拨查询物品分类接口 2.解决超级管理员无法登录 3.修改手机号
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 5dd5eae..a6d8f21 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -118,7 +118,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
}
@@ -268,7 +268,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
}
@@ -288,7 +288,7 @@
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
@ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),})
@GetMapping("/list/export")
- public void export(Long id, Integer type, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, Integer type, HttpServletResponse response) throws Exception {
TemplateExportParams params;
String fileName;
@@ -322,7 +322,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
- downLoadExcel(fileName, response, workbook);
+ String filePath = downLoadExcel(fileName, response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1