Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r13906 -r13911
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13906)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13911)
@@ -1720,7 +1720,7 @@
 							invoiceItem.setDisposableGoodsId(expensiveDisposablegoods.getDisposableGoodsID());
 							invoiceItem.setDisposableGoodsStockId(expensiveDisposablegoods.getDisposableGoodsStockID());
 							invoiceItem.setDisposableGoodsBatchId(expensiveDisposablegoods.getDisposableGoodsBatchID());
-							invoiceItem.setDisposableGoodsBatchStockId(expensiveDisposablegoods.getId());
+							invoiceItem.setDisposableGoodsBatchStockId(disposableGoodsBatchStock.getId());
 							Double price = expensiveDisposablegoods.getPrice();
 							BigDecimal fluctuationPrice = MathTools.mul(
 									price, floatPercent).setScale(
@@ -4127,6 +4127,7 @@
 					batchNumberToInvoiceItemMap.put(batchNumber, invoiceItem);
 				}
 				invoiceItem.setBarcode(disposableGoodsBatchStock.getBarcode());
+//				invoiceItem.setExpensiveDGBarcode(expensiveDGBarcode);
 				invoiceItem.setBatchNumber(batchNumber);
 				List<ExpensiveDisposablegoods> invoiceItemExpensiveDisposablegoods = invoiceItem
 						.getExpensiveDisposablegoods();