Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12738 -r12742
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12738)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12742)
@@ -562,9 +562,9 @@
 			String wareHouseId) {
 		String sql = buildGetDisposableGoodsSql(simpleSpell, allItems);
 		
-		if(DatabaseUtil.isPoIdValid(wareHouseId)){
+		/*if(DatabaseUtil.isPoIdValid(wareHouseId)){
 			sql += " and po.wareHouseID = " + wareHouseId;
-		}
+		}*/
 		List<DisposableGoods> disposableGoodsList = objectDao.findBySql(
 				DisposableGoods.class.getSimpleName(), sql);
 
@@ -915,7 +915,7 @@
 	}
 	public DisposableGoodsBatchStock getDisposableGoodsStockByBatchNumber(Long warehouseID,Long disposableGoodsID, String batchNumber){
 		String sql = String.format(
-				" where po.warehouseID=%s po.disposableGoodsID=%s and po.batchNumber='%s' ",
+				" where po.warehouseID=%s and po.disposableGoodsID=%s and po.batchNumber='%s' ",warehouseID,
 				disposableGoodsID, batchNumber);
 		return (DisposableGoodsBatchStock) objectDao.getBySql(
 				DisposableGoodsBatchStock.class.getSimpleName(), sql);