From 850d7ae98608119495c2cf5408d376ef12253eca Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 14:38:23 +0800
Subject: [PATCH] 提交 相关参数

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java |   93 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 75 insertions(+), 18 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..6191b4e 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
@@ -23,6 +23,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -38,7 +39,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 +47,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 +55,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 +64,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 +72,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 +80,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 +88,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 +96,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 +104,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 +112,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 +129,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 +144,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 +152,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,15 +160,23 @@
     @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("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛鏃ユ湡鏃堕棿鏌ヨ")
+    @SaCheckPermission("warehouseReport.search")
+    @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
+    public Result getSelectFinishedOperateLogReportByDatetime(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String reportTime, @RequestBody FinishedOperateLog finishedOperateLog){
+        return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReportByDateTime(type,pageNum,pageSize,selectDate,reportTime,finishedOperateLog));
+    }
+
 
     @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
     @PostMapping("/exportFinishedOperateLogReport/{type}")
@@ -176,13 +185,61 @@
         DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates,type),"orderReport");
     }
 
+    @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭鏃ユ湡鏃堕棿")
+    @PostMapping("/exportFinishedOperateLogReportByDatetime/{type}")
+    public void exportFinishedOperateLogReportByDatetime(
+            @PathVariable String type,HttpServletResponse response,
+            @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
+        //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+        DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReportByDatetime(dates,type),"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));
+        return Result.success(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.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