Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r35385 -r35386 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 35385) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 35386) @@ -3395,7 +3395,11 @@ for(Entry entry : dgIdToTotalAmountMap.entrySet()){ Long dgId = entry.getKey(); Integer sendAmount = entry.getValue(); - Long stockAmount = dgIdToDisposableGoodsStockMap.get(entry.getKey()).getAmount(); + Long stockAmount = 0L; + DisposableGoodsStock stock = dgIdToDisposableGoodsStockMap.get(dgId); + if(stock != null){ + stockAmount = stock.getAmount(); + } if(stockAmount == null){ stockAmount = 0L; }