From 37fce1a5a19d25453eb7481ce56eb71423e72af1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 25 四月 2024 11:43:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index 38b1854..b7c9f31 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -176,4 +176,31 @@
}
}
+
+ /*鍑哄叆搴撹褰曟煡璇�*/
+ @ApiOperation("鍑哄叆搴撹褰曟煡璇㈡帴鍙�")
+ @PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
+ public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
+ }
+
+ /*鍑哄叆搴撹繑鍥�*/
+ @ApiOperation("鍑哄叆搴撹繑鍥炴帴鍙�")
+ @PostMapping("/cancelFinishedGoodsInventoryStorage")
+ public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"杩斿洖澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectFinishedOperateLogReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
+ }
}
--
Gitblit v1.8.0