Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r37569 -r37585
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 37569)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 37585)
@@ -471,8 +471,8 @@
 			if(StringUtils.isNotBlank(currentOrgUnitCode)){
 				String warehousePredicate = String.format("select id from %s  where orgUnitCode in (%s) ",
 						WareHouse.class.getSimpleName(),currentOrgUnitCodeSql);
-				sqlBuilder.append(String.format(" AND (po.orgUnitCoding in (%s) OR po.location in (%s) OR po.wareHouseId in (%s))",
-						orgUnitCodingFromSupplyRoomConfigSql,currentOrgUnitCodeSql,warehousePredicate));
+				sqlBuilder.append(String.format(" AND (po.orgUnitCoding in (%s) OR (po.location in (%s) and po.location_2 is null) OR po.location_2 in (%s) OR po.wareHouseId in (%s))",
+						orgUnitCodingFromSupplyRoomConfigSql,currentOrgUnitCodeSql,currentOrgUnitCodeSql,warehousePredicate));
 			}else{
 				sqlBuilder.append(String.format(" AND 1=0 "));
 			}