Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
===================================================================
diff -u -r13292 -r13294
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js	(.../godownStockTakeView.js)	(revision 13292)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js	(.../godownStockTakeView.js)	(revision 13294)
@@ -387,7 +387,7 @@
 //		hidden : SSTS_WarehouseEntry_Delete,
 		iconCls : 'icon_print',
 		handler : function() {
-			commonEntry.onPrintEntryDetail(grid,entityName);
+			commonEntry.onPrintEntryDetail(grid,"盘盈盘亏");
 		}
 	},'-',{
 		text : '打印列表',
@@ -400,7 +400,7 @@
 			map["endDate"] = Ext.getCmp('endDate').getRawValue();
 			map["type"] = "盘盈盘亏";
 			  
-			commonEntry.onPrintEntryList(map,entityName);
+			commonEntry.onPrintEntryList(map,"盘盈盘亏");
 		}
 	}];
 	
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
===================================================================
diff -u -r13292 -r13294
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(.../commonEntry.js)	(revision 13292)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(.../commonEntry.js)	(revision 13294)
@@ -93,7 +93,7 @@
 		}else if(entryType == '调拨单'){
 			godownEntrysInfo.applicationType = "一次性物品调拨单";
 			godownEntrysInfo.formTypeOfPrinted = 'appropriation';
-		}else if(entryType == '一次性物品盘盈盘亏单'){
+		}else if(entryType == '盘盈盘亏'){
 			godownEntrysInfo.applicationType = "一次性物品盘盈盘亏单";
 			godownEntrysInfo.formTypeOfPrinted = 'godownStockTake';
 		}else{
@@ -167,6 +167,8 @@
 					  if(rs.success == true){
 						  if(entryType == '退库单'){
 							  rs.formTypeOfPrinted = 'godownEntryOutList';
+						  }else if(entryType == '盘盈盘亏'){
+							  rs.formTypeOfPrinted = 'godownStockTakeList';
 						  }else{
 							  rs.formTypeOfPrinted = 'godownEntryList';
 						  }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r13292 -r13294
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13292)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13294)
@@ -205,7 +205,7 @@
 	 */
 	private String getGodownEntryListHql(Map<String, String> sqlWhereParamMap) {
 		String godownEntryType = sqlWhereParamMap.get("type");
-		boolean isAppropriation = "调拨单".equals(godownEntryType);
+		//boolean isAppropriation = "调拨单".equals(godownEntryType);
 		boolean isStockTake = "盘盈盘亏".equals(godownEntryType);
 		String code = sqlWhereParamMap.get("code");
 		String batchNumber = sqlWhereParamMap.get("batchNumber");
@@ -214,10 +214,11 @@
 			sql += " and po.subType in ('" + GodownEntry.SUBTYPE_STOCKTAKE_IN + "','" + GodownEntry.SUBTYPE_STOCKTAKE_OUT + "')";
 		}else{
 			sql += " and po.type='" + godownEntryType + "'";
+			sql += " and po.subType in ('" + GodownEntry.SUBTYPE_MANUAL_IN + "','" + GodownEntry.SUBTYPE_MANUAL_OUT + "')";
 		}
-		if(!isAppropriation){
+		/*if(!isAppropriation){
 			sql += " and (po.sourceId is null or po.sourceId = 0)";
-		}
+		}*/
 		String startDate = sqlWhereParamMap.get("startDate");
 		String endDate = sqlWhereParamMap.get("endDate");
 		if (StringUtils.isNotBlank(code)) {
@@ -254,14 +255,14 @@
 		}
 		sql += " and " + dateQueryAdapter.dateAreaSql("po.time", startDate, endDate);
 		Set<Long> currentUserWarehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds();
-		if(isAppropriation){
+		/*if(isAppropriation){
 			String subType=sqlWhereParamMap.get("subType");
 			if(GodownEntry.SUBTYPE_MOVE_IN.equals(subType)){
 				sql += " and ( " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.targetWareHouseId", currentUserWarehouseIds);
 			}else{
 				sql += " and ( " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", currentUserWarehouseIds);
 			}
-		}else{
+		}else*/{
 			sql += " and ( " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.warehouseID", currentUserWarehouseIds);
 		}
 		sql += " ) ";