From 13fb46afecae05a088eba23fd6676b5038787822 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 11 五月 2024 10:06:31 +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/MaterialInventoryController.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
index bc35d70..fb1c3b4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -1,6 +1,7 @@
 package com.example.erp.controller.mm;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.example.erp.common.Constants;
 import com.example.erp.common.Result;
 import com.example.erp.entity.mm.*;
@@ -24,6 +25,7 @@
     MaterialInventoryService materialInventoryService;
 
     @ApiOperation("鐗╂枡鍑哄簱鏂板鎺ュ彛")
+    @SaCheckPermission("CreateOutbound.add")
     @PostMapping("/saveMaterialOutbound")
     public Result saveMaterialOutbound( @RequestBody Map<String,Object>  object){
         if(materialInventoryService.saveMaterialOutbound(object)){
@@ -35,6 +37,7 @@
     }
 
     @ApiOperation("鐗╂枡鏂板鎺ュ彛")
+    @SaCheckPermission("SelectIngredientsStock.add")
     @PostMapping("/saveMaterialInventory")
     public Result saveMaterialInventory( @RequestBody Map<String,Object>  object){
         if(materialInventoryService.saveMaterialInventory(object)){
@@ -46,36 +49,42 @@
     }
 
     @ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
+    @SaCheckPermission("SelectIngredientsStock.search")
     @PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectMaterialInventoryDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
         return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
     }
 
     @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鍔犳椂闂存煡璇㈡帴鍙�")
+    @SaCheckPermission("SelectIngredientsStock.search")
     @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
         return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
     }
 
     @ApiOperation("鐗╂枡搴撳瓨鏌ヨ鎺ュ彛")
+    @SaCheckPermission("CreateOutbound.search")
     @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
     public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
         return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
     }
 
     @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鏌ヨ鎺ュ彛")
+    @SaCheckPermission("SelectIngredientsStock.search")
     @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
     public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
         return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
     }
 
-    @ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛")
+    @ApiOperation("鏉愭枡鍑哄簱鍔犳椂闂存煡璇㈡帴鍙�")
+    @SaCheckPermission("MaterialOutbound.search")
     @PostMapping("/getSelectMaterialOutboundDate/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectMaterialOutboundDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialOutbound materialOutbound){
         return Result.seccess(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
     }
 
     @ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛")
+    @SaCheckPermission("CreateOutbound.search")
     @PostMapping("/getSelectMaterialOutbound/{pageNum}/{pageSize}")
     public Result getSelectMaterialOutbound(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialOutboundDetail materialOutboundDetail){
         return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
@@ -83,6 +92,7 @@
 
 
     @ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛")
+    @SaCheckPermission("CreateOutbound.review")
     @PostMapping("/updateMaterialOutboundToExamine")
     public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
         if(materialInventoryService.updateMaterialOutboundToExamine(object)){
@@ -94,7 +104,8 @@
         }
     }
 
-    @ApiOperation("鐗╂枡鍒犻櫎鎺ュ彛")
+    @ApiOperation("鏉愭枡鍑哄簱鍒犻櫎鎺ュ彛")
+    @SaCheckPermission("MaterialOutbound.delete")
     @PostMapping("/deleteMaterialOutbound")
     public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
         if(materialInventoryService.deleteMaterialOutbound(object)){
@@ -108,6 +119,7 @@
     }
 
     @ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
+    @SaCheckPermission("ReturnToStorageCreate.add")
     @PostMapping("/saveReturningWarehouse")
     public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
         if(materialInventoryService.saveReturningWarehouse(object)){
@@ -119,12 +131,14 @@
     }
 
     @ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
+    @SaCheckPermission("ReturnToStorageCreate.search")
     @PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
     public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
         return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
     }
 
     @ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
+    @SaCheckPermission("ReturnToStorageCreate.review")
     @PostMapping("/updateReturningWarehouseToExamine")
     public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
         if(materialInventoryService.updateReturningWarehouseToExamine(object)){
@@ -138,6 +152,7 @@
 
 
     @ApiOperation("鐗╂枡杩斿簱鏌ヨ鎺ュ彛")
+    @SaCheckPermission("ReturnToStorage.search")
     @PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
         return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));

--
Gitblit v1.8.0