Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
===================================================================
diff -u -r12781 -r12803
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java	(.../WareHouseManagerImpl.java)	(revision 12781)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java	(.../WareHouseManagerImpl.java)	(revision 12803)
@@ -169,6 +169,15 @@
 		return (WareHouse)objectDao.getByProperty(WareHouse.class.getSimpleName(), "id", id);
 	}
 
+	/**
+	 * 根据仓库id查询仓库信息
+	 * @param id
+	 * @return
+	 */
+	public WareHouse getWareHouseById(String id){
+		return (WareHouse)objectDao.getByProperty(WareHouse.class.getSimpleName(), "id", id);
+	}
+	
 	@Override
 	public JSONObject getAllWareHouse(String orgUnitCoding) {
 		OrgUnit orgUnit = new OrgUnit();
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r12774 -r12803
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 12774)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 12803)
@@ -295,21 +295,6 @@
 		}
 	}
 
-	private GoodsStock newGoodsStock(TousseInstance tousseInstance,WareHouse wareHouse){
-		if(tousseInstance == null || wareHouse == null){
-			return null;
-		}
-		GoodsStock goodsStock = new GoodsStock();
-		goodsStock.setAmount(1);
-		goodsStock.setGoodsType(GoodsStock.TYPE_TOUSSE);
-		goodsStock.setName(tousseInstance.getTousseName());
-		goodsStock.setOrgUnitCode(wareHouse.getOrgUnitCode());
-		goodsStock.setOrgUnitName(wareHouse.getOrgUnitName());
-		goodsStock.setTousseDefinitionId(tousseInstance.getTousseDefinition().getId());
-		goodsStock.setWareHouseId(wareHouse.getId());
-		goodsStock.setWareHouseName(wareHouse.getName());
-		return goodsStock;
-	}
 	@Override
 	public String completeSterilization(Collection<Long> sterilizationRecordIds,
 			String orgUnitCode,String finishOperater) {
@@ -401,7 +386,7 @@
 				}
 				updateTousseInstanceProperty(sdf, sterilizationRecord,
 						tousseInstance);
-				GoodsStock goodsStock = newGoodsStock(tousseInstance,defaultWareHouse);
+				GoodsStock goodsStock = TousseInstanceUtils.newGoodsStock(tousseInstance,defaultWareHouse);
 				goodsStockList.add(goodsStock);
 				tousseInstanceManager.setToWareHouse(tousseInstance, defaultWareHouse);
 				tousseInstanceManager.saveOrUpdate(tousseInstance);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
===================================================================
diff -u -r12773 -r12803
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(.../WareHouseManager.java)	(revision 12773)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(.../WareHouseManager.java)	(revision 12803)
@@ -72,6 +72,12 @@
 	 * @return
 	 */
 	public WareHouse getWareHouseById(Long id);
+	/**
+	 * 根据仓库id查询仓库信息
+	 * @param id
+	 * @return
+	 */
+	public WareHouse getWareHouseById(String id);
 
 	/**
 	 * 根据科室编码获取科室下所有的仓库,返回json对象