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/MaterialInventoryController.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 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 595fea9..cd0494d 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
@@ -18,26 +18,23 @@
import java.util.Map;
@RestController
-@RequestMapping("/MaterialInventory")
+@RequestMapping("/materialInventory")
@Api(value="鐗╂枡搴撳瓨controller",tags={"鐗╂枡搴撳瓨鎿嶄綔鎺ュ彛"})
public class MaterialInventoryController {
@Autowired
MaterialInventoryService materialInventoryService;
@ApiOperation("鐗╂枡鍑哄簱鏂板鎺ュ彛")
- @SaCheckPermission("CreateOutbound.add")
+ @SaCheckPermission("createOutbound.add")
@PostMapping("/saveMaterialOutbound")
public Result saveMaterialOutbound( @RequestBody Map<String,Object> object){
- if(materialInventoryService.saveMaterialOutbound(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
- }
+ return Result.seccess(materialInventoryService.saveMaterialOutbound(object));
+
}
@ApiOperation("鐗╂枡鏂板鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.add")
+ @SaCheckPermission("selectIngredientsStock.add")
@PostMapping("/saveMaterialInventory")
public Result saveMaterialInventory( @RequestBody Map<String,Object> object){
if(materialInventoryService.saveMaterialInventory(object)){
@@ -49,42 +46,42 @@
}
@ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @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")
+ @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")
+ @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")
+ @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("鏉愭枡鍑哄簱鍔犳椂闂存煡璇㈡帴鍙�")
- @SaCheckPermission("MaterialOutbound.search")
+ @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")
+ @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));
@@ -92,35 +89,35 @@
@ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛")
- @SaCheckPermission("CreateOutbound.review")
+ @SaCheckPermission("createOutbound.review")
@PostMapping("/updateMaterialOutboundToExamine")
public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
}
@ApiOperation("鏉愭枡鍑哄簱鍒犻櫎鎺ュ彛")
- @SaCheckPermission("MaterialOutbound.delete")
+ @SaCheckPermission("materialOutbound.delete")
@PostMapping("/deleteMaterialOutbound")
public Result deleteMaterialOutbound( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
- @SaCheckPermission("ReturnToStorageCreate.add")
+ @SaCheckPermission("returnToStorageCreate.add")
@PostMapping("/saveReturningWarehouse")
public Result saveReturningWarehouse( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
- @SaCheckPermission("ReturnToStorageCreate.search")
+ @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")
+ @SaCheckPermission("returnToStorageCreate.review")
@PostMapping("/updateReturningWarehouseToExamine")
public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
@@ -128,7 +125,7 @@
@ApiOperation("鐗╂枡杩斿簱鏌ヨ鎺ュ彛")
- @SaCheckPermission("ReturnToStorage.search")
+ @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));
@@ -136,19 +133,26 @@
@ApiOperation("浣欐枡搴撳瓨鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectSurplusMaterialsDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectSurplusMaterialsDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody SurplusMaterials surplusMaterials){
return Result.seccess(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
}
@ApiOperation("浣欐枡鏂板鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/addSelectSurplusMaterialsDate")
public Result addSelectSurplusMaterialsDate( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
}
+ @ApiOperation("鐗╂枡鍑哄簱鎵撳嵃鎺ュ彛")
+ @SaCheckPermission("selectIngredientsStock.search")
+ @GetMapping ("/printCreateOutbound/{materialOutboundId}")
+ public Result printCreateOutbound(@PathVariable String materialOutboundId) {
+ return Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));
+ }
+
--
Gitblit v1.8.0