Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java
===================================================================
diff -u -r12807 -r12810
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java	(.../InvoicePlanManagerTests.java)	(revision 12807)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java	(.../InvoicePlanManagerTests.java)	(revision 12810)
@@ -84,23 +84,9 @@
 			TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
 			//4.模拟创建器械包实例并灭菌
 			//4.1 创建对应的仓库
-			WareHouse wareHouse1 = new WareHouse();
-			wareHouse1.setCreatedUserId(1l);
-			wareHouse1.setCreatedUserName("admin");
-			wareHouse1.setCreateTime(new Date());
-			wareHouse1.setName("仓库1");
-			wareHouse1.setOrgUnitCode("admin");
-			wareHouse1.setOrgUnitName("供应室");
-			wareHouseManager.saveOrUpdateWareHouse(wareHouse1);
+			WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD");
 			
-			WareHouse wareHouse2 = new WareHouse();
-			wareHouse2.setCreatedUserId(1l);
-			wareHouse2.setCreatedUserName("admin");
-			wareHouse2.setCreateTime(new Date());
-			wareHouse2.setName("仓库2");
-			wareHouse2.setOrgUnitCode("testOR");
-			wareHouse2.setOrgUnitName("临床科室");
-			wareHouseManager.saveOrUpdateWareHouse(wareHouse2);
+			WareHouse wareHouse2 = wareHouseManager.getDefaultWareHouseByUnitCode("testOR");;
 			
 			TousseInstance tousseInstance1 = new TousseInstance();
 			tousseInstance1.setTousseDefinition(td);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r12807 -r12810
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 12807)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 12810)
@@ -34,6 +34,8 @@
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.directory.model.CssdHandleTousses;
+import com.forgon.directory.model.CssdServiceDepts;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.DirectoryHelper;
 import com.forgon.directory.service.OrgUnitManager;
@@ -61,10 +63,13 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.tousseGroup.TousseGroup;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
+import com.forgon.disinfectsystem.entity.stocktakemanager.StockTakeInfo;
+import com.forgon.disinfectsystem.entity.stocktakemanager.StockTakeItem;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager;
 import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager;
@@ -670,13 +675,15 @@
 		objectDao.excuteSQL("delete from materialInstance");
 		objectDao.excuteSQL("delete from traceableMaterial");
 		objectDao.excuteSQL("delete from materialentryitem");
+		objectDao.excuteSQL("delete from materialentry");
 		
 		
 		objectDao.excuteSQL("delete from imagefile");
 		
 		objectDao.excuteSQL("delete from TousseGroup");
 
 		objectDao.excuteSQL("delete from StockTakeItem");
+		objectDao.excuteSQL("delete from StockTakeInfo");
 		objectDao.excuteSQL("delete from StockIdentificationOfGoods");
 		objectDao.excuteSQL("delete from StockDiposableGoodBatch");
 		objectDao.excuteSQL("delete from StockDiposableGoods");
@@ -732,7 +739,7 @@
 		objectDao.excuteSQL("delete from invoicePlan");
 		
 		objectDao.excuteSQL("delete from receiveRecordItem");
-		objectDao.excuteSQL("delete from IdentificationOfDiposableGoods");
+		objectDao.excuteSQL("delete from IdentificationOfDisposableGoods");
 		objectDao.excuteSQL("delete from DisposableGoodsBatchStock");
 
 		objectDao.excuteSQL("delete from DiposableGoodsTemplateItem");
@@ -741,8 +748,11 @@
 		objectDao.excuteSQL("delete from GodownEntryItem");
 		objectDao.excuteSQL("delete from GodownEntry");
 		
-		objectDao.excuteSQL("delete from " + DisposableGoodsStock.class.getSimpleName());
+		objectDao.excuteSQL("delete from DisposableGoodsStock");
 		
+		objectDao.excuteSQL("delete from DisposableGoods");
+		objectDao.excuteSQL("delete from DisposableGoodsBatch");
+		
 		//objectDao.excuteSQL("delete from DataDirectory_GYEY_COST_ACCOUNTING");
 		
 		objectDao.excuteSQL("delete from OrgUserRelation");
@@ -764,20 +774,27 @@
 		objectDao.excuteSQL("delete from Sterilizer");
 		
 		objectDao.excuteSQL("delete from OrgUnit");
-		objectDao.excuteSQL("delete from barcodeDevice");
 		
 		objectDao.excuteSQL("delete from UseRecord");
 		
 		objectDao.excuteSQL("delete from RecallRecordItem");
 		objectDao.excuteSQL("delete from RecallRecord");
 
 		objectDao.excuteSQL("delete from DepartmentStock");
+		
+		//多仓库新增加的相关实体(条码表放置最后)
+		objectDao.excuteSQL("delete from CssdHandleTousses");
+		objectDao.excuteSQL("delete from CssdServiceDepts");
+		objectDao.excuteSQL("delete from GoodsStock");
+		objectDao.excuteSQL("delete from WareHouse");
+		objectDao.excuteSQL("delete from barcodeDevice");
 	}
 	
 	/**
 	 * 初始化基础数据
 	 * 任务组：【常规组】（测试供应室）、【术科组】（测试供应室）、【器械组】（测试手术室）
 	 * 一次性物品类型：【注射器】、【纱块】
+	 * 仓库、供应室处理器械包配置、供应室服务处理科室配置
 	 */
 	public void initBaseData() {
 		initSerialNum();
@@ -866,6 +883,51 @@
 		supplyRoomConfig41.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_4);
 		supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig41);
 		
+		//初始化仓库(测试一级供应室配置两个仓库;其它测试科室(二级供应室与临床科室各配置一个仓库))
+		WareHouse wareHouse1 = new WareHouse();
+		wareHouse1.setCreatedUserId(1l);
+		wareHouse1.setCreatedUserName("admin");
+		wareHouse1.setCreateTime(new Date());
+		wareHouse1.setName("测试供应室仓库1");
+		wareHouse1.setOrgUnitCode("testCSSD");
+		wareHouse1.setOrgUnitName("测试供应室");
+		wareHouse1.setBarcode("010009001");
+		wareHouse1.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE);
+		objectDao.save(wareHouse1);
+		
+		WareHouse wareHouse2 = new WareHouse();
+		wareHouse2.setCreatedUserId(1l);
+		wareHouse2.setCreatedUserName("admin");
+		wareHouse2.setCreateTime(new Date());
+		wareHouse2.setName("测试手术室仓库1");
+		wareHouse2.setOrgUnitCode("testOR");
+		wareHouse2.setOrgUnitName("测试手术室");
+		wareHouse2.setBarcode("010009002");
+		wareHouse2.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE);
+		objectDao.save(wareHouse2);
+		
+		WareHouse wareHouse3 = new WareHouse();
+		wareHouse3.setCreatedUserId(1l);
+		wareHouse3.setCreatedUserName("admin");
+		wareHouse3.setCreateTime(new Date());
+		wareHouse3.setName("测试内科仓库1");
+		wareHouse3.setOrgUnitCode("testNeike");
+		wareHouse3.setOrgUnitName("测试内科");
+		wareHouse3.setBarcode("010009003");
+		wareHouse3.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE);
+		objectDao.save(wareHouse3);
+		
+		WareHouse wareHouse4 = new WareHouse();
+		wareHouse4.setCreatedUserId(1l);
+		wareHouse4.setCreatedUserName("admin");
+		wareHouse4.setCreateTime(new Date());
+		wareHouse4.setName("测试外科仓库1");
+		wareHouse4.setOrgUnitCode("testWaike");
+		wareHouse4.setOrgUnitName("测试外科");
+		wareHouse4.setBarcode("010009004");
+		wareHouse4.setType(BarcodeDevice.BARCODE_TYPE_WAREHOUSE);
+		objectDao.save(wareHouse4);
+		
 		Container container1 = new Container();
 		container1.setBarcode("019000001");
 		container1.setContainerName("清洗筐116");