From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 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 7c03533..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
@@ -164,16 +164,16 @@
 
     @ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
     @SaCheckPermission("warehouseReport.search")
-    @PostMapping("/getSelectFinishedOperateLogReport/{pageNum}/{pageSize}/{selectDate}")
-    public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
-        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
+    @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));
     }
 
     @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
-    @PostMapping("/exportFinishedOperateLogReport")
-    public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+    @PostMapping("/exportFinishedOperateLogReport/{type}")
+    public void exportFinishedOperateLogReport(@PathVariable String type,HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
         //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
-        DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
+        DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates,type),"orderReport");
     }
 
 
@@ -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