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 3832362ec..bbee1309d 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 d9318b738..444c8a813 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 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 nameList = StringUtil.strToStringList(nameStr); //仓库列表 List depotList = depotService.getAllList();