|
@@ -200,6 +200,15 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods> implement
|
|
}
|
|
}
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+ if (columnValue.equals("stockType")) {
|
|
|
|
+ for (StockType stockType : StockType.values()) {
|
|
|
|
+ if (stockType.getMsg().equals(row.get(s).toString())) {
|
|
|
|
+ objectMap.put(columnValue, stockType);
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
if (columnValue.equals("goodsCategoryName")) {
|
|
if (columnValue.equals("goodsCategoryName")) {
|
|
Integer integer = map.get(row.get(s));
|
|
Integer integer = map.get(row.get(s));
|
|
if(integer == null){
|
|
if(integer == null){
|