From 20249c17d5b28c588e88451545af291995271f9c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 14:07:21 +0800
Subject: [PATCH] 1.出库手续回显 2.调拨申请时库存查询更换接口
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 cb9cf66..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("鏈烘瀯鏃犻粯璁や粨搴擄紒");
}
@@ -322,7 +322,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
- return ResponseValue.success(downLoadExcel(fileName, response, workbook));
+ String filePath = downLoadExcel(fileName, response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1