Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r12853 -r12858
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12853)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12858)
@@ -38,6 +38,7 @@
 
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
@@ -1937,8 +1938,8 @@
 				.getSerialNumberStr(SerialNum.TYPE_INVOICE));
 		invoice.setSettleAccountsDepart(invoicePlan.getSettleAccountsDepart());
 		invoice.setStatus(Invoice.STATUS_DELIVERED);
-		invoice.setOrgUnitCoding(supplyRoomConfigManager
-				.getFirstSupplyRoomConfig().getOrgUnitCoding());
+		invoice.setOrgUnitCoding(AcegiHelper.getLoginUser()
+				.getCurrentOrgUnitCode());
 		// 是否有回收误差(非一次性物品)
 		if (!invoicePlanType
 				.equals(InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM)) {