Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r12942 -r12982
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12942)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12982)
@@ -1892,16 +1892,22 @@
 		String applicant = "";
 		String time = "";
 		String supplierName = "";//供应商
+		String warehouseName = "";
+		String targetWarehouseName = "";
 		if(list.size() == 1){
 			GodownEntry godownEntry = list.get(0);
 			serialNumber = godownEntry.getSerialNumber();
 			time = ForgonDateUtils.safelyFormatDate(godownEntry.getTime(), Constants.DATEFORMAT_YYYYMMDD, "");
 			supplierName = godownEntry.getSupplierName();
+			warehouseName = godownEntry.getWarehouseName();
+			targetWarehouseName = godownEntry.getTargetWareHouseName();
 		}
 		jsonObject.put("serialNumber", serialNumber);
 		jsonObject.put("applicant", applicant);
 		jsonObject.put("godownEntryTime", time);
 		jsonObject.put("supplierName", supplierName);
+		jsonObject.put("warehouseName", warehouseName);
+		jsonObject.put("targetWarehouseName", targetWarehouseName);
 		
 		tousseList = loadToussePrintData(list);
 		jsonObject.put("goods", tousseList);
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r12965 -r12982
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12965)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12982)
@@ -103,9 +103,13 @@
 	}
 	private String getGodownEntryListSql(Map<String, String> sqlWhereParamMap) {
 		String godownEntryType = sqlWhereParamMap.get("type");
+		boolean isAppropriation = "调拨单".equals(godownEntryType);
 		String code = sqlWhereParamMap.get("code");
 		String batchNumber = sqlWhereParamMap.get("batchNumber");
-		String sql = "where po.type='" + godownEntryType + "' and (po.sourceId is null or po.sourceId = 0)";
+		String sql = "where po.type='" + godownEntryType + "'";
+		if(!isAppropriation){
+			sql += " and (po.sourceId is null or po.sourceId = 0)";
+		}
 		int codeIndex = code.lastIndexOf("[");
 		String specification = "";
 		if (StringUtils.isNotBlank(code) && code.lastIndexOf("[") != -1) {
@@ -141,7 +145,12 @@
 			//sql += " and po.time <= " + dateQueryAdapter.dateAdapter(endDate);
 		}
 		sql += " and " + dateQueryAdapter.dateAreaSql("po.time", startDate, endDate);
-		sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds());
+		Set<Long> currentUserWarehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds();
+		sql += " and ( " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", currentUserWarehouseIds);
+		if(isAppropriation){
+			sql += " or " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.targetWareHouseId", currentUserWarehouseIds);
+		}
+		sql += " ) ";
 		return sql;
 	}
 
@@ -173,7 +182,9 @@
 	public String findAppropriationTableList(
 			Map<String, List<String>> parameterMap){
 		String sql = "where po.type='" + GodownEntry.TYPE_APPROPRIATE + "'";
-		sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds());
+		sql += " and ( " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds());
+		sql += " or " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.targetWareHouseId", wareHouseManager.getCurrentUserOrgUnitWarehouseIds());
+		sql += " ) ";
 		return gridManager.renderGrid(parameterMap,
 				GodownEntry.class.getSimpleName(), sql,
 				new String[] { "itemsList" });