From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 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 fb1c3b4..9a8fece 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
@@ -95,39 +95,21 @@
@SaCheckPermission("CreateOutbound.review")
@PostMapping("/updateMaterialOutboundToExamine")
public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
- if(materialInventoryService.updateMaterialOutboundToExamine(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
-
- }
+ return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
}
@ApiOperation("鏉愭枡鍑哄簱鍒犻櫎鎺ュ彛")
@SaCheckPermission("MaterialOutbound.delete")
@PostMapping("/deleteMaterialOutbound")
public Result deleteMaterialOutbound( @RequestBody Map<String,Object> object){
- if(materialInventoryService.deleteMaterialOutbound(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
-
- }
+ return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
@SaCheckPermission("ReturnToStorageCreate.add")
@PostMapping("/saveReturningWarehouse")
public Result saveReturningWarehouse( @RequestBody Map<String,Object> object){
- if(materialInventoryService.saveReturningWarehouse(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
-
- }
+ return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
@@ -141,13 +123,7 @@
@SaCheckPermission("ReturnToStorageCreate.review")
@PostMapping("/updateReturningWarehouseToExamine")
public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
- if(materialInventoryService.updateReturningWarehouseToExamine(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
-
- }
+ return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
}
@@ -159,6 +135,28 @@
}
+ @ApiOperation("浣欐枡搴撳瓨鏌ヨ鎺ュ彛")
+ @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")
+ @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