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 | 22 ++++++++++++++++++++++
1 files changed, 22 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 5cb7702..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
@@ -135,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