Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r12738 -r12789
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 12738)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 12789)
@@ -152,6 +152,16 @@
 		}
 		return batchs;
 	}
+	public String getBatchsByDiposableGoodsId(String id,String wareHouseId,
+			boolean selectAll) {
+		List<DisposableGoodsBatchStock> batchStocks = diposableGoodBatchStockManager
+				.getDiposableGoodBatchInfoByDiposableGoodsId(id,wareHouseId, selectAll);
+		String batchs = "[]";
+		if(batchStocks != null){
+			batchs = JSONUtil.toJSONStringEx(batchStocks,true,DisposableGoodsBatchStock.filterProperties);
+		}
+		return batchs;
+	}
 	
 	public String getExpDateByDiposableGoodsId_batcherNum(String id,
 			String batcherNumber) {
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
===================================================================
diff -u -r12738 -r12789
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java	(.../DiposableGoodBatchStockManager.java)	(revision 12738)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java	(.../DiposableGoodBatchStockManager.java)	(revision 12789)
@@ -43,6 +43,15 @@
 
 	public List<DisposableGoodsBatchStock> getDiposableGoodBatchInfoByDiposableGoodsId(
 			String id, boolean selectAll);
+	/**
+	 * 根据一次性物品id查找一次性物品的批次库存
+	 * @param id 一次性物品的id
+	 * @param wareHouseId 仓库id
+	 * @param selectAll 是否包含库存为0的记录
+	 * @return
+	 */
+	public List<DisposableGoodsBatchStock> getDiposableGoodBatchInfoByDiposableGoodsId(
+			String id,String wareHouseId, boolean selectAll);
 
 	public List<DiposableGoodsStorageVo> getDiposableGoodsStorageVos();
 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
===================================================================
diff -u -r12728 -r12789
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java	(.../DiposableGoodBatchStockManagerImpl.java)	(revision 12728)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java	(.../DiposableGoodBatchStockManagerImpl.java)	(revision 12789)
@@ -213,17 +213,26 @@
 	@Override
 	public List<DisposableGoodsBatchStock> getDiposableGoodBatchInfoByDiposableGoodsId(
 			String id, boolean selectAll) {
+		return getDiposableGoodBatchInfoByDiposableGoodsId(id,null,selectAll);
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<DisposableGoodsBatchStock> getDiposableGoodBatchInfoByDiposableGoodsId(
+			String id,String wareHouseId, boolean selectAll) {
 		if (StringUtils.isNotBlank(id)) {
 			String sql = " where po.diposableGoods.id = " + id;
 			if (!selectAll) {
 				sql += " and po.storage > 0";
 			}
+			if(DatabaseUtil.isPoIdValid(wareHouseId)){
+				sql += " and po.warehouseID = " + wareHouseId;
+			}
 			return objectDao.findBySql(
 					DisposableGoodsBatchStock.class.getSimpleName(), sql);
 		}
 		return null;
 	}
-
+	
 	/**
 	 * 根据一次性物品定义拿到该物品对应的任意一个标识号
 	 *