From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +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/FinishedGoodsInventoryController.java |   69 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 19 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 70dd20d..a5df64c 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
@@ -38,7 +38,7 @@
     @SaCheckPermission("productStockList.search")
     @PostMapping("/getSelect/{pageNum}/{pageSize}")
     public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
-        return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
+        return Result.success(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
     }
 
     /*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
@@ -46,7 +46,7 @@
     @SaCheckPermission("createProductStock.search")
     @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
     public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
-        return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
+        return Result.success(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
     }
 
     /*鎴愬搧鍏ュ簱*/
@@ -54,7 +54,7 @@
     @SaCheckPermission("createProductStock.add")
     @PostMapping("/addSelectWarehousing")
     public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
+        return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));
 
     }
 
@@ -63,7 +63,7 @@
     @SaCheckPermission("finishedProductOut.search")
     @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
     public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
-        return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
+        return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
     }
 
     /*鎴愬搧鍙戣揣*/
@@ -71,7 +71,7 @@
     @SaCheckPermission("finishedProductOut.add")
     @PostMapping("/addDeliveryDetail")
     public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
+        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
     }
 
     /* 璋冩嫧鏌ヨ*/
@@ -79,7 +79,7 @@
     @SaCheckPermission("orderAllocation.search")
     @PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
     public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
-        return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
+        return Result.success(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
     }
 
     /*璁㈠崟璋冩嫧*/
@@ -87,7 +87,7 @@
     @SaCheckPermission("orderAllocation.add")
     @PostMapping("/updateFinishedGoodsInventoryAllocate")
     public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
+        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
     }
 
     /*璋冩嫧璁板綍鏌ヨ*/
@@ -95,7 +95,7 @@
     @SaCheckPermission("transferRecord.search")
     @PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
-        return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
+        return Result.success(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
     }
 
     /*璁㈠崟棰嗗嚭*/
@@ -103,7 +103,7 @@
     @SaCheckPermission("finishedGoodsIssue.add")
     @PostMapping("/updateFinishedGoodsInventoryTakeOut")
     public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
+        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
     }
 
     /*棰嗗嚭璁板綍鏌ヨ*/
@@ -111,14 +111,14 @@
     @SaCheckPermission("takeOutRecord.search")
     @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
-        return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
+        return Result.success(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
     }
 
     /*璁㈠崟杩斿伐*/
     @ApiOperation("璁㈠崟杩斿伐鏌ヨ鎺ュ彛")
     @PostMapping("/updateFinishedGoodsInventoryRework")
     public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
+        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
     }
 
 
@@ -128,14 +128,14 @@
     @SaCheckPermission("takeOutRecord.review")
     @PostMapping("/updateFinishedGoodsInventoryToExamine")
     public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳"));
+        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳"));
     }
     /*璁㈠崟鍙嶅*/
     @ApiOperation("璁㈠崟鍙嶅鎺ュ彛")
     @SaCheckPermission("takeOutRecord.review")
     @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
     public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅"));
+        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅"));
     }
 
     /*璁㈠崟浣滃簾*/
@@ -143,7 +143,7 @@
     @SaCheckPermission("takeOutRecord.update")
     @PostMapping("/cancelFinishedGoodsInventoryToExamine")
     public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
+        return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
     }
 
     /*鍑哄叆搴撹褰曟煡璇�*/
@@ -151,7 +151,7 @@
     @SaCheckPermission("storageRecord.search")
     @PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
     public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
-        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
+        return Result.success(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
     }
 
     /*鍑哄叆搴撹繑鍥�*/
@@ -159,14 +159,14 @@
     @SaCheckPermission("storageRecord.update")
     @PostMapping("/cancelFinishedGoodsInventoryStorage")
     public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
+        return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
     }
 
     @ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
     @SaCheckPermission("warehouseReport.search")
     @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectFinishedOperateLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
-        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
+        return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
     }
 
     @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
@@ -182,7 +182,7 @@
     @SaCheckPermission("createProductStock.add")
     @PostMapping("/oneClickStorage/{orderId}/{userName}")
     public Result oneClickStorage( @PathVariable String  orderId,@PathVariable String  userName){
-        return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
+        return Result.success(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
 
     }
 
@@ -191,6 +191,37 @@
     @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));
+        return Result.success(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
+    }
+
+    /*瑁呯鎵撳嵃鏌ヨ*/
+    @ApiOperation("瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+    @SaCheckPermission("storageRecordPint.search")
+    @PostMapping("/getSelectPrint")
+    public Result getSelectPrint( @RequestBody Map<String, Object> object){
+        return Result.success(finishedGoodsInventoryService.getSelectPrintSv(object));
+    }
+
+    /*瑁呯鎵撳嵃鏌ヨ*/
+    @ApiOperation("瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+    @SaCheckPermission("storageRecordPint.search")
+    @PostMapping("/getSelectPrints")
+    public Result getSelectPrints( @RequestBody Map<String, Object> object){
+        return Result.success(finishedGoodsInventoryService.getSelectPrintSvs(object));
+    }
+    /*瑁呯鎵撳嵃鏌ヨ*/
+    @ApiOperation("搴撳瓨瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+    @SaCheckPermission("createProductStock.search")
+    @PostMapping("/getInventoryPrints")
+    public Result getInventoryPrints( @RequestBody List<FinishedGoodsInventory> finishedGoodsInventories){
+        return Result.success(finishedGoodsInventoryService.getInventoryPrints(finishedGoodsInventories));
+    }
+
+    @ApiOperation("鎴愬搧瑁呯璋冩灦")
+    @SaCheckPermission("createProductStock.add")
+    @PostMapping("/changeRack/{user}")
+    public Result changeRack( @RequestBody FinishedGoodsInventory  finishedGoodsInventory,@PathVariable String user){
+        return Result.success(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));
+
     }
 }

--
Gitblit v1.8.0