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

优化商品导入功能

Browse Source
This commit is contained in:
季圣华
2020-06-06 00:20:09 +08:00
parent 748da238ab
commit 761721ec91
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -387,7 +387,6 @@ public class MaterialService {
Long categoryId = materialCategoryService.getCategoryIdByName(categoryName); Long categoryId = materialCategoryService.getCategoryIdByName(categoryName);
m.setCategoryid(categoryId); m.setCategoryid(categoryId);
m.setSafetystock(parseBigDecimalEx(safetyStock)); m.setSafetystock(parseBigDecimalEx(safetyStock));
m.setUnit(unit);
String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位 String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位
String barCode = ExcelUtils.getContent(src, i, 8); //基础条码 String barCode = ExcelUtils.getContent(src, i, 8); //基础条码
String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码 String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码
@@ -417,6 +416,8 @@ public class MaterialService {
otherObj.put("wholesaleDecimal", parsePrice(wholesaleDecimal,ratio)); otherObj.put("wholesaleDecimal", parsePrice(wholesaleDecimal,ratio));
otherObj.put("lowDecimal", parsePrice(lowDecimal,ratio)); otherObj.put("lowDecimal", parsePrice(lowDecimal,ratio));
materialExObj.put("other", otherObj); materialExObj.put("other", otherObj);
} else {
m.setUnit(unit);
} }
m.setMaterialExObj(materialExObj); m.setMaterialExObj(materialExObj);
String enabled = ExcelUtils.getContent(src, i, 15); //状态 String enabled = ExcelUtils.getContent(src, i, 15); //状态