Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r38097 -r38119
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 38097)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 38119)
@@ -7201,7 +7201,6 @@
 					disposableGoodsStock.setWarehouseName(warehouseName);
 					disposableGoodsStock.setWbCode(disposableGoods.getWbCode());
 					objectDao.saveOrUpdate(disposableGoodsStock);
-					expensiveDisposablegoods.setDisposableGoodsStockID(disposableGoodsStock.getId());
 				}
 				DisposableGoodsBatchStock disposableGoodsBatchStock = diposableGoodBatchStockManager.getDisposableGoodsBatchStockByWarehouseIdAndBatchId(warehouseId, disposableGoodsID);
 				if(disposableGoodsBatchStock == null){
@@ -7226,8 +7225,9 @@
 					disposableGoodsBatchStock.setWarehouseID(warehouseId);
 					disposableGoodsBatchStock.setWarehouseName(warehouseName);
 					objectDao.saveOrUpdate(disposableGoodsBatchStock);
-					expensiveDisposablegoods.setDisposableGoodsBatchStock(disposableGoodsBatchStock);
 				}
+				expensiveDisposablegoods.setDisposableGoodsBatchStock(disposableGoodsBatchStock);
+				expensiveDisposablegoods.setDisposableGoodsStockID(disposableGoodsStock.getId());
 				expensiveDisposablegoods.adjustAmount(1);
 				objectDao.saveOrUpdate(expensiveDisposablegoods);
 				objectDao.saveOrUpdate(disposableGoodsBatchStock);