From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 dbd855f..2fade75 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
@@ -185,4 +185,43 @@
return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
}
+
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("瑁呯鎵撳嵃鏌ヨ鎺ュ彛")
+ @SaCheckPermission("storageRecordPint.search")
+ @PostMapping("/getSelectStorageRecordPint/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectStorageRecordPint(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
+ }
+
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+ @SaCheckPermission("storageRecordPint.search")
+ @PostMapping("/getSelectPrint")
+ public Result getSelectPrint( @RequestBody Map<String, Object> object){
+ return Result.seccess(finishedGoodsInventoryService.getSelectPrintSv(object));
+ }
+
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+ @SaCheckPermission("storageRecordPint.search")
+ @PostMapping("/getSelectPrints")
+ public Result getSelectPrints( @RequestBody Map<String, Object> object){
+ return Result.seccess(finishedGoodsInventoryService.getSelectPrintSvs(object));
+ }
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("搴撳瓨瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+ @SaCheckPermission("createProductStock.search")
+ @PostMapping("/getInventoryPrints")
+ public Result getInventoryPrints( @RequestBody List<FinishedGoodsInventory> finishedGoodsInventories){
+ return Result.seccess(finishedGoodsInventoryService.getInventoryPrints(finishedGoodsInventories));
+ }
+
+ @ApiOperation("鎴愬搧瑁呯璋冩灦")
+ @SaCheckPermission("createProductStock.add")
+ @PostMapping("/changeRack/{user}")
+ public Result changeRack( @RequestBody FinishedGoodsInventory finishedGoodsInventory,@PathVariable String user){
+ return Result.seccess(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));
+
+ }
}
--
Gitblit v1.8.0