From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 2b3682b..0daeba8 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
@@ -28,23 +28,23 @@
/*鎴愬搧搴撳瓨鏌ヨ*/
@ApiOperation("鎴愬搧搴撳瓨鏌ヨ鎺ュ彛")
- @PostMapping("/getselet/{pageNum}/{pageSize}")
+ @PostMapping("/getSelect/{pageNum}/{pageSize}")
public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
}
/*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
@ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
- @PostMapping("/getseletwarehousing/{pageNum}/{pageSize}")
- public Result getseletwarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
- return Result.seccess(finishedGoodsInventoryService.getseletwarehousing(pageNum,pageSize,flowCard));
+ @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
+ public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
+ return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
}
/*鎴愬搧鍏ュ簱*/
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
- @PostMapping("/addseletwarehousing")
- public Result addseletwarehousing( @RequestBody Map<String,Object> object){
- if(finishedGoodsInventoryService.addseletwarehousing(object)){
+ @PostMapping("/addSelectWarehousing")
+ public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
+ if(finishedGoodsInventoryService.addSelectWarehousing(object)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"鍏ュ簱澶辫触");
@@ -54,16 +54,16 @@
/*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
@ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
- @PostMapping("/getseletdeliveryDetail/{pageNum}/{pageSize}")
- public Result getseletdeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
- return Result.seccess(finishedGoodsInventoryService.getseletdeliveryDetail(pageNum,pageSize,orderDetail));
+ @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
+ public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
}
/*鎴愬搧鍙戣揣*/
@ApiOperation("鎴愬搧鍙戣揣鎺ュ彛")
- @PostMapping("/adddeliveryDetail")
- public Result adddeliveryDetail( @RequestBody Map<String,Object> object){
- if(finishedGoodsInventoryService.adddeliveryDetail(object)){
+ @PostMapping("/addDeliveryDetail")
+ public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
+ if(finishedGoodsInventoryService.addDeliveryDetail(object)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"鍑哄簱澶辫触");
@@ -94,9 +94,9 @@
/*璋冩嫧璁板綍鏌ヨ*/
@ApiOperation("璋冩嫧璁板綍鏌ヨ鎺ュ彛")
- @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));
+ @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));
}
/*璁㈠崟棰嗗嚭*/
@@ -151,8 +151,8 @@
}
/*璁㈠崟鍙嶅*/
@ApiOperation("璁㈠崟鍙嶅鎺ュ彛")
- @PostMapping("/updateFinishedGoodsInventoryCounterexamination")
- public Result updateFinishedGoodsInventoryCounterexamination( @RequestBody Map<String,Object> object){
+ @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
+ public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object> object){
if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅")){
return Result.seccess();
--
Gitblit v1.8.0