Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java =================================================================== diff -u -r13948 -r13954 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 13948) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 13954) @@ -426,8 +426,8 @@ item.setStorage(item.getStorage() + 1); }else{ item = newInventoryItem(record, warehouse,disposableGoodsStock,disposableGoodsBatchStock,price,disposableGoods.getGoodsType()); - itemsGroupedByPrice.add(item); item.setStorage(1); + itemsGroupedByPrice.add(item); } InventoryExpensiveGoodsItem expensiveGoodsItem = new InventoryExpensiveGoodsItem(); expensiveGoodsItem.setBarcode(expensiveGoods.getBarcode()); @@ -459,9 +459,17 @@ itemsGroupedByPrice = new LinkedList(); itemsGroupedByPriceMap.put(price, itemsGroupedByPrice); } - InventoryItem item = newInventoryItem(record,warehouse,disposableGoodsStock,disposableGoodsBatchStock,price,disposableGoods.getGoodsType()); - item.setStorage(Integer.valueOf(""+identification.getAmount())); - itemsGroupedByPrice.add(item); + + Integer identificationAmount = Integer.valueOf(""+identification.getAmount()); + InventoryItem item = null; + if(itemsGroupedByPrice.size() > 0){ + item = itemsGroupedByPrice.get(0); + item.setStorage(item.getStorage() + identificationAmount); + }else{ + item = newInventoryItem(record, warehouse,disposableGoodsStock,disposableGoodsBatchStock,price,disposableGoods.getGoodsType()); + item.setStorage(identificationAmount); + itemsGroupedByPrice.add(item); + } } for (List itemsGroupedByPrice : itemsGroupedByPriceMap.values()) { items.addAll(itemsGroupedByPrice);