From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00: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 | 17 +++++++++++++++++
1 files changed, 17 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 43665b7..617b6f1 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
@@ -188,7 +188,24 @@
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));
+ }
}
--
Gitblit v1.8.0