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/FinishedGoodsInventoryController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index 99d6cdf..b12a326 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -157,7 +157,7 @@
/*鍑哄叆搴撹繑鍥�*/
@ApiOperation("鍑哄叆搴撹繑鍥炴帴鍙�")
@SaCheckPermission("storageRecord.update")
- @PostMapping("/cancelFini shedGoodsInventoryStorage")
+ @PostMapping("/cancelFinishedGoodsInventoryStorage")
public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
}
@@ -175,4 +175,14 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
}
+
+
+ /*璁㈠崟涓�閿叆搴�*/
+ @ApiOperation("璁㈠崟涓�閿叆搴�")
+ @SaCheckPermission("CreateProductStock.add")
+ @PostMapping("/oneClickStorage/{orderId}/{userName}")
+ public Result oneClickStorage( @PathVariable String orderId,@PathVariable String userName){
+ return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
+
+ }
}
--
Gitblit v1.8.0