From 2f7b09613f51661555d956e29b8b34b3105966e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 6 Jun 2020 17:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/service/material/MaterialService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java index a5e4a472..663b4041 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -20,6 +20,7 @@ import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.ExcelUtils; import com.jsh.erp.utils.StringUtil; +import jxl.Cell; import jxl.Sheet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -424,7 +425,8 @@ public class MaterialService { m.setEnabled(enabled.equals("1")? true: false); //缓存各个仓库的库存信息 Map stockMap = new HashMap(); - for(int j=1; j<=depotCount;j++) { + int depotSize = depotCount>10? 10: depotCount; //excel里面的仓库数量 + for(int j=1; j<=depotSize;j++) { int col = 15+j; if(col <= src.getColumns()){ String depotName = ExcelUtils.getContent(src, 1, col); //获取仓库名称