From 1af3e08b428406fad48114e0563896f51ee52823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 9 Apr 2023 22:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF=E7=9A=84Excel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= 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/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 4bc16273..8c9507ef 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -568,6 +568,8 @@ public class MaterialService { String enabled = ExcelUtils.getContent(src, i, 16); //状态 String enableSerialNumber = ExcelUtils.getContent(src, i, 17); //序列号 String enableBatchNumber = ExcelUtils.getContent(src, i, 18); //批号 + String remark = ExcelUtils.getContent(src, i, 19); //备注 + m.setRemark(remark); //状态格式错误 if(!"1".equals(enabled) && !"0".equals(enabled)) { throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_ENABLED_ERROR_CODE, @@ -748,7 +750,7 @@ public class MaterialService { private Map getStockMapCache(Sheet src, int depotCount, Map depotMap, int i) throws Exception { Map stockMap = new HashMap<>(); for(int j = 1; j<= depotCount; j++) { - int col = 18+j; + int col = 19 + j; if(col < src.getColumns()){ String depotName = ExcelUtils.getContent(src, 1, col); //获取仓库名称 if(StringUtil.isNotEmpty(depotName)) {