From affb7a70b6dd7cdd8628a1c8eb9d5a4ad76005f1 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 27 Mar 2025 22:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=AF=BC=E5=87=BAex?=
 =?UTF-8?q?cel=E7=9A=84=E5=88=97=E5=90=8D=E8=BF=9B=E8=A1=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/MaterialController.java   | 2 +-
 .../main/java/com/jsh/erp/service/MaterialService.java    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index 3832362e..bbee1309 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -480,7 +480,7 @@ public class MaterialController extends BaseController {
             materialService.exportExcel(StringUtil.toNull(categoryId), StringUtil.toNull(materialParam), StringUtil.toNull(color),
                     StringUtil.toNull(materialOther), StringUtil.toNull(weight),
                     StringUtil.toNull(expiryNum), StringUtil.toNull(enabled), StringUtil.toNull(enableSerialNumber),
-                    StringUtil.toNull(enableBatchNumber), StringUtil.toNull(remark), response);
+                    StringUtil.toNull(enableBatchNumber), StringUtil.toNull(remark), mpList, response);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
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 d9318b73..444c8a81 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
@@ -464,7 +464,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, HttpServletResponse response)throws Exception {
+                                             String remark, String mpList, HttpServletResponse response)throws Exception {
         List<Long> idList = new ArrayList<>();
         if(StringUtil.isNotEmpty(categoryId)){
             idList = getListByParentId(Long.parseLong(categoryId));
@@ -479,8 +479,12 @@ public class MaterialService {
             //遇到多个副条码的情况，只加第一个
             otherMaterialMap.putIfAbsent(me.getMaterialId(), me);
         }
+        String otherField = "扩展1,扩展2,扩展3";
+        if(StringUtil.isNotEmpty(mpList)) {
+            otherField = mpList;
+        }
         String nameStr = "名称*,规格,型号,颜色,品牌,类别,基础重量(kg),保质期(天),基本单位*,副单位,基本条码*,副条码,比例,多属性," +
-                "采购价,零售价,销售价,最低售价,状态*,序列号,批号,仓位货架,制造商,扩展1,扩展2,扩展3,备注";
+                "采购价,零售价,销售价,最低售价,状态*,序列号,批号,仓位货架,制造商," + otherField + ",备注";
         List<String> nameList = StringUtil.strToStringList(nameStr);
         //仓库列表
         List<Depot> depotList = depotService.getAllList();