|
@@ -133,11 +133,11 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
|
|
|
Map<Long,Integer>storgeStockCountMap = new HashMap<Long,Integer>();
|
|
|
//存放到map中
|
|
|
for(Map m:shelvesStockCountlist){
|
|
|
- shelvesStockCountMap.put(Long.valueOf(m.get("id").toString()),m);
|
|
|
+ shelvesStockCountMap.put(Long.valueOf(m.get("id")==null?"0":m.get("id").toString()),m);
|
|
|
}
|
|
|
|
|
|
for(Map m:storgeStockCountlist){
|
|
|
- storgeStockCountMap.put(Long.valueOf(m.get("id").toString()),Integer.parseInt(m.get("count").toString()));
|
|
|
+ storgeStockCountMap.put(Long.valueOf(m.get("id")==null?"0":m.get("id").toString()),Integer.parseInt(m.get("count").toString()));
|
|
|
}
|
|
|
|
|
|
//查询出所有货架
|