From 683ba1d97c9012fc201dc4c0a3104fc7b71c3989 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 12 Jul 2025 16:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=AC=A1=E5=AF=BC=E5=87=BA=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA1=E4=B8=87=E6=9D=A1=E8=A6=81=E7=BB=99=E4=B8=AA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=9C=A8=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=82=A3=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/constants/ExceptionConstants.java     | 3 ---
 .../src/main/java/com/jsh/erp/service/MaterialService.java | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
index 18b747b0..02070350 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
@@ -356,9 +356,6 @@ public class ExceptionConstants {
     //EXCEL中有副条码在系统中已存在（除自身商品之外）
     public static final int MATERIAL_EXCEL_IMPORT_MANY_BARCODE_EXIST_CODE = 80000028;
     public static final String MATERIAL_EXCEL_IMPORT_MANY_BARCODE_EXIST_MSG = "抱歉，EXCEL中有副条码在系统中已存在，具体副条码为：%s";
-    //单次导出条数超出限制（1万条）
-    public static final int MATERIAL_EXPORT_LIMIT_CODE = 8000029;
-    public static final String MATERIAL_EXPORT_LIMIT_MSG = "单次导出条数超出限制（1万条）";
 
     /**
      *  单据信息
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
index c7fca0db..9ee628ab 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
@@ -472,6 +472,7 @@ public class MaterialService {
     public void exportExcel(String categoryId, String materialParam, String color, String materialOther, String weight,
                                              String expiryNum, String enabled, String enableSerialNumber, String enableBatchNumber,
                                              String remark, String mpList, HttpServletResponse response)throws Exception {
+        String title = "商品信息";
         List<Long> idList = new ArrayList<>();
         if(StringUtil.isNotEmpty(categoryId)){
             idList = getListByParentId(Long.parseLong(categoryId));
@@ -480,8 +481,9 @@ public class MaterialService {
         List<MaterialVo4Unit> dataList = materialMapperEx.exportExcel(materialParam, color, materialOther, weight, expiryNum, enabled, enableSerialNumber,
                 enableBatchNumber, remark, idList);
         if (null != dataList && dataList.size() > EXPORT_LIMIT) {
-            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_EXPORT_LIMIT_CODE,
-                    ExceptionConstants.MATERIAL_EXPORT_LIMIT_MSG);
+            File file = ExcelUtils.exportObjectsOneSheet(title, "单次导出条数超出限制（1万条）", new String[0], title, new ArrayList<>());
+            ExcelUtils.downloadExcel(file, file.getName(), response);
+            return;
         }
         //查询商品副条码相关列表
         Map<Long, MaterialExtend> otherMaterialMap = new HashMap<>();
@@ -513,7 +515,6 @@ public class MaterialService {
             }
         }
         String[] names = StringUtil.listToStringArray(nameList);
-        String title = "商品信息";
         List<Object[]> objects = new ArrayList<>();
         if (null != dataList) {
             for (MaterialVo4Unit m : dataList) {