Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r12881 -r12912
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 12881)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 12912)
@@ -6,12 +6,15 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.directwebremoting.util.Logger;
 
 import com.forgon.component.grid.GridManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DisposableGoodsBatchManager;
@@ -21,6 +24,7 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;
@@ -40,6 +44,8 @@
 	private DateQueryAdapter dateQueryAdapter;
 	
 	private DisposableGoodsBatchManager disposableGoodsBatchManager;
+	
+	private WareHouseManager wareHouseManager;
 
 	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
 		this.dateQueryAdapter = dateQueryAdapter;
@@ -63,8 +69,14 @@
 			DisposableGoodsBatchManager disposableGoodsBatchManager) {
 		this.disposableGoodsBatchManager = disposableGoodsBatchManager;
 	}
-
-	// 查找物品库存
+	public void setWareHouseManager(WareHouseManager wareHouseManager) {
+		this.wareHouseManager = wareHouseManager;
+	}
+	/**
+	 * 查找物品库存
+	 * @param parameterMap
+	 * @return
+	 */
 	public String findDisposableGoodsStockTableList(
 			Map<String, List<String>> parameterMap) {
 		Map<String, String> sqlWhereParamMap = gridManager
@@ -89,6 +101,11 @@
 		} else {
 			sql += " and 1=1";
 		}
+		List<WareHouse> warehouseList = wareHouseManager.getWareHouseListByCurrentOrgUnit();
+		if(warehouseList != null && !warehouseList.isEmpty()){
+			Set<Long> warehouseIds = warehouseList.stream().map(warehouse->warehouse.getId()).collect(Collectors.toSet());
+			sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", warehouseIds);
+		}
 		return gridManager.renderGrid(parameterMap,
 				DisposableGoodsStock.class.getSimpleName(), sql,
 				new String[] { "goodsBatchs" });