From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 c8d8951..dbe4b0e 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
@@ -167,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 {
@@ -175,6 +182,39 @@
}
+ @ApiOperation("mes鍒囧壊鎶ュ伐")
+ @PostMapping ("/mesMaterialOutbound")
+ public Result mesMaterialOutbound(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
+ }
+
+ @ApiOperation("mes鍘熺墖鏌ヨ")
+ @PostMapping ("/mesOriginalSelect")
+ public Result mesOriginalSelect() {
+ return Result.seccess(materialInventoryService.mesOriginalSelect());
+ }
+
+ @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));
+ }
+
+ @ApiOperation("鐗╂枡鍑哄簱淇濆瓨骞跺鏍告帴鍙�")
+ @SaCheckPermission("createOutbound.add")
+ @PostMapping("/saveToExamineMaterialOutbound")
+ public Result saveToExamineMaterialOutbound( @RequestBody Map<String,Object> object){
+
+ return Result.seccess(materialInventoryService.saveToExamineMaterialOutbound(object));
+
+ }
}
--
Gitblit v1.8.0