From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +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 | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 99d6cdf..7c03533 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
@@ -27,7 +27,7 @@
import java.util.Map;
@RestController
-@RequestMapping("/FinishedGoodsInventory")
+@RequestMapping("/finishedGoodsInventory")
@Api(value="鎴愬搧搴撳瓨controller",tags={"鎴愬搧搴撳瓨鎿嶄綔鎺ュ彛"})
public class FinishedGoodsInventoryController {
@Autowired
@@ -35,7 +35,7 @@
/*鎴愬搧搴撳瓨鏌ヨ*/
@ApiOperation("鎴愬搧搴撳瓨鏌ヨ鎺ュ彛")
- @SaCheckPermission("ProductStockList.search")
+ @SaCheckPermission("productStockList.search")
@PostMapping("/getSelect/{pageNum}/{pageSize}")
public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
@@ -43,7 +43,7 @@
/*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
@ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
- @SaCheckPermission("CreateProductStock.search")
+ @SaCheckPermission("createProductStock.search")
@PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
@@ -51,7 +51,7 @@
/*鎴愬搧鍏ュ簱*/
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
- @SaCheckPermission("CreateProductStock.add")
+ @SaCheckPermission("createProductStock.add")
@PostMapping("/addSelectWarehousing")
public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
@@ -60,7 +60,7 @@
/*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
@ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
- @SaCheckPermission("FinishedProductOut.search")
+ @SaCheckPermission("finishedProductOut.search")
@PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
@@ -68,7 +68,7 @@
/*鎴愬搧鍙戣揣*/
@ApiOperation("鎴愬搧鍙戣揣鎺ュ彛")
- @SaCheckPermission("FinishedProductOut.add")
+ @SaCheckPermission("finishedProductOut.add")
@PostMapping("/addDeliveryDetail")
public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
@@ -76,7 +76,7 @@
/* 璋冩嫧鏌ヨ*/
@ApiOperation("鍙皟鎷ㄦ暟鎹煡璇㈡帴鍙�")
- @SaCheckPermission("OrderAllocation.search")
+ @SaCheckPermission("orderAllocation.search")
@PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
@@ -84,7 +84,7 @@
/*璁㈠崟璋冩嫧*/
@ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
- @SaCheckPermission("OrderAllocation.add")
+ @SaCheckPermission("orderAllocation.add")
@PostMapping("/updateFinishedGoodsInventoryAllocate")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
@@ -92,7 +92,7 @@
/*璋冩嫧璁板綍鏌ヨ*/
@ApiOperation("璋冩嫧璁板綍鏌ヨ鎺ュ彛")
- @SaCheckPermission("TransferRecord.search")
+ @SaCheckPermission("transferRecord.search")
@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));
@@ -100,7 +100,7 @@
/*璁㈠崟棰嗗嚭*/
@ApiOperation("璁㈠崟棰嗗嚭鎺ュ彛")
- @SaCheckPermission("FinishedGoodsIssue.add")
+ @SaCheckPermission("finishedGoodsIssue.add")
@PostMapping("/updateFinishedGoodsInventoryTakeOut")
public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
@@ -108,7 +108,7 @@
/*棰嗗嚭璁板綍鏌ヨ*/
@ApiOperation("棰嗗嚭璁板綍鏌ヨ鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.search")
+ @SaCheckPermission("takeOutRecord.search")
@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));
@@ -125,14 +125,14 @@
/*璁㈠崟瀹℃牳*/
@ApiOperation("璁㈠崟瀹℃牳鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.review")
+ @SaCheckPermission("takeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryToExamine")
public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳"));
}
/*璁㈠崟鍙嶅*/
@ApiOperation("璁㈠崟鍙嶅鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.review")
+ @SaCheckPermission("takeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryCounterExamination")
public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅"));
@@ -140,7 +140,7 @@
/*璁㈠崟浣滃簾*/
@ApiOperation("璁㈠崟浣滃簾鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.update")
+ @SaCheckPermission("takeOutRecord.update")
@PostMapping("/cancelFinishedGoodsInventoryToExamine")
public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
@@ -157,13 +157,13 @@
/*鍑哄叆搴撹繑鍥�*/
@ApiOperation("鍑哄叆搴撹繑鍥炴帴鍙�")
@SaCheckPermission("storageRecord.update")
- @PostMapping("/cancelFini shedGoodsInventoryStorage")
+ @PostMapping("/cancelFinishedGoodsInventoryStorage")
public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
}
@ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
- @SaCheckPermission("WarehouseReport.search")
+ @SaCheckPermission("warehouseReport.search")
@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));
@@ -175,4 +175,14 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
}
+
+
+ /*璁㈠崟涓�閿叆搴�*/
+ @ApiOperation("璁㈠崟涓�閿叆搴�")
+ @SaCheckPermission("createProductStock.add")
+ @PostMapping("/oneClickStorage/{orderId}/{userName}")
+ public Result oneClickStorage( @PathVariable String orderId,@PathVariable String userName){
+ return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
+
+ }
}
--
Gitblit v1.8.0