From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

---
 src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index 87a9b7d..a963aa1 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -81,8 +81,11 @@
     @PostMapping("/export")
     @ApiOperation("瀵煎嚭鐢ㄦ按绠$悊")
     public void export(HttpServletResponse response) {
+        Page page = new Page(-1,-1);
+        WaterRecord waterRecord = new WaterRecord();
+        IPage<WaterRecord> listPage = waterRecordService.listPage(page, waterRecord);
         ExcelUtil<WaterRecord> util = new ExcelUtil<WaterRecord>(WaterRecord.class);
-        util.exportExcel(response, null , "鐢ㄦ按绠$悊");
+        util.exportExcel(response, listPage.getRecords() , "鐢ㄦ按绠$悊");
     }
 
 }

--
Gitblit v1.9.3