Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r12748 -r12751
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12748)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12751)
@@ -72,7 +72,10 @@
 	
 	public void updateDiposableGoodsPriceFromExcelFile();
 	
+	@Deprecated
 	public List<Map<String, Object>> getDiposableGoodsList(String sql,boolean showReferencePrice);
+	
+	public List<Map<String, Object>> getDisposableGoodsList(String sql,boolean showReferencePrice,String wareHouseId);
 
 	public DisposableGoodsStock getDiposableGoodsByInventorySerialNumber(String inventorySerialNumber);
 	///////////////
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12750 -r12751
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12750)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12751)
@@ -565,6 +565,16 @@
 		/*if(DatabaseUtil.isPoIdValid(wareHouseId)){
 			sql += " and po.wareHouseID = " + wareHouseId;
 		}*/
+		List<Map<String, Object>> mapList = getDisposableGoodsListInternal(
+				wareHouseId, sql,true);
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("totalCount", mapList.size());
+		map.put("data", mapList);
+		return JSONObject.fromObject(map);
+	}
+
+	private List<Map<String, Object>> getDisposableGoodsListInternal(
+			String wareHouseId, String sql,boolean showReferencePrice) {
 		List<DisposableGoods> disposableGoodsList = objectDao.findBySql(
 				DisposableGoods.class.getSimpleName(), sql);
 
@@ -575,15 +585,12 @@
 			DisposableGoodsStock goodsStock = disposableGoodsStockManager.getDisposableGoodsStockByDisposableGoodsId(
 					disposableGoods.getId() + "",wareHouseId);
 			Map<String,Object> item = buildDisposableGoodsPropertyMap(disposableGoods,goodsStock,floatPercent,
-					true);
+					showReferencePrice);
 			if(item != null){
 				mapList.add(item);
 			}
 		}
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("totalCount", mapList.size());
-		map.put("data", mapList);
-		return JSONObject.fromObject(map);
+		return mapList;
 	}
 
 	private Map<String,Object> buildDisposableGoodsPropertyMap(DisposableGoods disposableGoods,
@@ -728,6 +735,9 @@
 		}
 		return returnValue;
 	}
+	public List<Map<String, Object>> getDisposableGoodsList(String sql,boolean showReferencePrice,String wareHouseId){
+		return this.getDisposableGoodsListInternal(wareHouseId, sql, showReferencePrice);
+	}
 	@SuppressWarnings("unchecked")
 	public List<Map<String, Object>> getDiposableGoodsList(String sql,boolean showReferencePrice) {
 		List<DisposableGoodsStock> disposableGoodsStockList = objectDao.findBySql(