From 7b8cc84950a3caeb8cae5e99a7aa99c1aafa6ac7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 22 二月 2024 14:18:17 +0800
Subject: [PATCH] 提交分架代码
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 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 942d4ee..c938e49 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
@@ -77,15 +77,15 @@
return Result.seccess();
}else {
- throw new ServiceException(Constants.Code_500,"璋冩嫧澶辫触");
+ throw new ServiceException(Constants.Code_500,"璋冩嫧澶辫触,璇锋鏌ヨ鍗曡緭鍏ユ槸鍚︽纭�");
}
}
- /*棰嗗嚭鏌ヨ*/
- @PostMapping("/getselectAllocateFinishedOperateLog/{pageNum}/{pageSize}")
- public Result getselectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedOperateLog finishedOperateLog){
- return Result.seccess(finishedGoodsInventoryService.getselectAllocateFinishedOperateLog(pageNum,pageSize,finishedOperateLog));
+ /*璋冩嫧璁板綍鏌ヨ*/
+ @PostMapping("/getselectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
+ public Result getselectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getselectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
}
/*璁㈠崟棰嗗嚭*/
@@ -102,8 +102,48 @@
}
/*棰嗗嚭璁板綍鏌ヨ*/
- @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}")
- public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedOperateLog finishedOperateLog){
- return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,finishedOperateLog));
+ @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
+ }
+
+ /*璁㈠崟杩斿伐*/
+ @PostMapping("/updateFinishedGoodsInventoryRework")
+ public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"杩斿伐澶辫触");
+
+ }
+ }
+
+
+
+ /*璁㈠崟瀹℃牳*/
+ @PostMapping("/updateFinishedGoodsInventoryToExamine")
+ public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳")){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
+
+ }
+ }
+ /*璁㈠崟鍙嶅*/
+ @PostMapping("/updateFinishedGoodsInventoryCounterexamination")
+ public Result updateFinishedGoodsInventoryCounterexamination( @RequestBody Map<String,Object> object){
+
+ if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅")){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
+
+ }
}
}
--
Gitblit v1.8.0