From e487f1bfa92d9e90dd8f876479bbfced09b4d58c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 29 十二月 2023 14:04:18 +0800
Subject: [PATCH] 添加角色查询接口
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 4fdd66d..58cf0a1 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
@@ -147,7 +147,7 @@
lWhFormTransfer.setOutWarehouseId(wareHouseId);
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
- lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
}
@@ -276,7 +276,7 @@
@ApiOperation(value = "璋冩嫧鍏ュ簱", notes = "璋冩嫧鍏ュ簱")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/income")
- public ResponseValue income(Long id) {
+ public ResponseValue income(Long id) throws Exception {
lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), null);
return ResponseValue.success();
}
@@ -289,7 +289,7 @@
@ApiOperation(value = "璋冩嫧鍑哄簱", notes = "璋冩嫧鍑哄簱")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/output")
- public ResponseValue output(Long id) {
+ public ResponseValue output(Long id) throws Exception {
List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
Set<Long> baseModelIds =
@@ -314,7 +314,7 @@
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
// lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
- lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.DIAOBO);
return ResponseValue.success();
}
@@ -356,7 +356,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
- String filePath = downLoadExcel(fileName, response, workbook);
+ String filePath = downLoadExcel(fileName, workbook);
return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1