purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品增加备注信息的Excel导入

Browse Source
This commit is contained in:
季圣华
2023-04-09 22:39:59 +08:00
parent a2fa99e638
commit 1af3e08b42
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -568,6 +568,8 @@ public class MaterialService {
String enabled = ExcelUtils.getContent(src, i, 16); //状态 String enabled = ExcelUtils.getContent(src, i, 16); //状态
String enableSerialNumber = ExcelUtils.getContent(src, i, 17); //序列号 String enableSerialNumber = ExcelUtils.getContent(src, i, 17); //序列号
String enableBatchNumber = ExcelUtils.getContent(src, i, 18); //批号 String enableBatchNumber = ExcelUtils.getContent(src, i, 18); //批号
String remark = ExcelUtils.getContent(src, i, 19); //备注
m.setRemark(remark);
//状态格式错误 //状态格式错误
if(!"1".equals(enabled) && !"0".equals(enabled)) { if(!"1".equals(enabled) && !"0".equals(enabled)) {
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_ENABLED_ERROR_CODE, throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_ENABLED_ERROR_CODE,
@@ -748,7 +750,7 @@ public class MaterialService {
private Map<Long, BigDecimal> getStockMapCache(Sheet src, int depotCount, Map<String, Long> depotMap, int i) throws Exception { private Map<Long, BigDecimal> getStockMapCache(Sheet src, int depotCount, Map<String, Long> depotMap, int i) throws Exception {
Map<Long, BigDecimal> stockMap = new HashMap<>(); Map<Long, BigDecimal> stockMap = new HashMap<>();
for(int j = 1; j<= depotCount; j++) { for(int j = 1; j<= depotCount; j++) {
int col = 18+j; int col = 19 + j;
if(col < src.getColumns()){ if(col < src.getColumns()){
String depotName = ExcelUtils.getContent(src, 1, col); //获取仓库名称 String depotName = ExcelUtils.getContent(src, 1, col); //获取仓库名称
if(StringUtil.isNotEmpty(depotName)) { if(StringUtil.isNotEmpty(depotName)) {