Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r14217 -r14959
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 14217)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 14959)
@@ -33,6 +33,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
@@ -208,9 +209,11 @@
 				if(supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode)){
 					// 科室为一级供应室，不限定装配科室
 				}else{
-					sqlBuilder.append(String.format(" AND (po.orgUnitCoding = '%s' OR po.location='%s')",
+					String warehousePredicate = "select id from " + WareHouse.class.getSimpleName() 
+									+ " where orgUnitCode='" + currentOrgUnitCode + "'";
+					sqlBuilder.append(String.format(" AND (po.orgUnitCoding = '%s' OR po.location='%s' OR po.wareHouseId in (%s))",
 							AcegiHelper.getLoginUser()
-									.getOrgUnitCodingFromSupplyRoomConfig(),currentOrgUnitCode));
+									.getOrgUnitCodingFromSupplyRoomConfig(),currentOrgUnitCode,warehousePredicate));
 				}
 			}else{
 				sqlBuilder.append(String.format(" AND 1=0 "));