From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 21a9f8f..02ccdce 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
@@ -42,12 +42,7 @@
@SaCheckPermission("selectIngredientsStock.add")
@PostMapping("/saveMaterialInventory")
public Result saveMaterialInventory( @RequestBody Map<String,Object> object){
- if(materialInventoryService.saveMaterialInventory(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
-
- }
+ return Result.seccess(materialInventoryService.saveMaterialInventory(object));
}
@ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
@@ -121,6 +116,13 @@
return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
}
+ @ApiOperation("鐗╂枡杩斿簱鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("returnToStorageCreate.delete")
+ @PostMapping("/deleteReturnToStorage")
+ public Result deleteReturnToStorage( @RequestBody Map<String,Object> object){
+ return Result.seccess(materialInventoryService.deleteReturnToStorage(object));
+ }
+
@ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
@SaCheckPermission("returnToStorageCreate.review")
@PostMapping("/updateReturningWarehouseToExamine")
@@ -165,6 +167,13 @@
return Result.seccess(materialInventoryService.getMaterialLogReport(type,pageNum,pageSize,selectDate,materialLog));
}
+ @ApiOperation("鐗╂枡搴撳瓨鍒犻櫎")
+ @SaCheckPermission("createOutbound.search")
+ @PostMapping("/deleteMaterialInventory")
+ public Result deleteMaterialInventory(@RequestBody Map<String,Object> object){
+ return Result.seccess(materialInventoryService.deleteMaterialInventory(object));
+ }
+
@ApiOperation("鐗╂枡鎶ヨ〃瀵煎嚭")
@PostMapping("/exportMaterialLogReport/{type}")
public void exportMaterialLogReport(@PathVariable String type, HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
@@ -173,6 +182,24 @@
}
+ @ApiOperation("mes鍒囧壊鎶ュ伐")
+ @PostMapping ("/mesMaterialOutbound")
+ public Result mesMaterialOutbound(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
+ }
+
+ @ApiOperation("鐗╂枡鏂板杩斿洖鎺ュ彛")
+ @PostMapping("/cancelMaterialAdditionRecord")
+ public Result cancelMaterialAdditionRecord( @RequestBody Map<String,Object> object){
+ return Result.seccess(materialInventoryService.cancelMaterialAdditionRecord(object));
+ }
+
+ @ApiOperation("浼樺寲鐗╂枡搴撳瓨璁板綍鏌ヨ鎺ュ彛")
+ @SaCheckPermission("warehouseReport.search")
+ @PostMapping("/getOptimizeOutboundReport/{type}/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOptimizeOutboundReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody MaterialLog materialLog){
+ return Result.seccess(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
+ }
}
--
Gitblit v1.8.0