From e83dacb5066a86db29dbdc232218d8aba6adc95f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 02 八月 2024 13:34:04 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
index 7b2efc6..eed691f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
@@ -124,7 +124,9 @@
     @PreAuthorize("hasAuthority('asrs:mat:list')")
     @PostMapping("/mat/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(matService.list(), Mat.class), response);
+        List<Mat> list = matService.parseMat(matService.list());
+        List<MatField> matFields = matFieldService.getMatFields();
+        ExcelUtil.build(ExcelUtil.create(list, Mat.class, matFields), response);
     }
 
     private void setMatField(HashMap<String, Object> param, Mat mat) {

--
Gitblit v1.9.1