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 e6f82672..5490190b 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 @@ -353,6 +353,9 @@ 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 444c8a81..2cfedd96 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 @@ -73,6 +73,8 @@ public class MaterialService { @Value(value="${file.uploadType}") private Long fileUploadType; + private static final Integer EXPORT_LIMIT = 10000; + public Material getMaterial(long id)throws Exception { Material result=null; try{ @@ -472,6 +474,10 @@ public class MaterialService { //查询商品主条码相关列表 List 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); + } //查询商品副条码相关列表 Map otherMaterialMap = new HashMap<>(); List otherDataList = materialMapperEx.getOtherMaterialList();