Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r12937 -r12943
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 12937)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 12943)
@@ -7509,8 +7509,8 @@
 		}
 		return list;
 	}
-	public List<GodownEntryItemVo> getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId){
-		List <GodownEntryItem> list = this.godownEntryItemManager.getGodownEntryItemList(startTime, endTime, suplier,"supplierName",warehouseId);
+	public List<GodownEntryItemVo> getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId,String type){
+		List <GodownEntryItem> list = this.godownEntryItemManager.getGodownEntryItemList(startTime, endTime, suplier,"supplierName",warehouseId,type);
 		List<GodownEntryItemVo> ret = new ArrayList<GodownEntryItemVo>();
 		GodownEntryItemVo vo = new GodownEntryItemVo();
 		if(list != null && !list.isEmpty()){
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
===================================================================
diff -u -r12939 -r12943
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 12939)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 12943)
@@ -11,8 +11,19 @@
 
 public interface GodownEntryItemManager {
 	public GodownEntryItem getGodownEntryItemById(String id);
-	public List<GodownEntryItem> getGodownEntryItemList(String startDate,String endDate,String supplier,String orderField,String warehouseId);
 	/**
+	 * 获取入库单或者退库单的列表
+	 * @param startDate 起始日期
+	 * @param endDate 结束日期
+	 * @param supplier 供应商
+	 * @param orderField 排序字段
+	 * @param warehouseId 仓库id
+	 * @param type 单类型，入库单或者是退库单
+	 * @return
+	 */
+	public List<GodownEntryItem> getGodownEntryItemList(String startDate,String endDate,
+			String supplier,String orderField,String warehouseId,String type);
+	/**
 	 * 设置物品到对应科室的默认仓库
 	 * @param entry
 	 */
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r12937 -r12943
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 12937)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 12943)
@@ -239,7 +239,8 @@
 	 * @param startTime 起始时间
 	 * @param endTime 结束时间
 	 * @param suplier 供应商
+	 * @param type 单类型，入库单或者是退库单
 	 * @return
 	 */
-	public List<GodownEntryItemVo> getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId);
+	public List<GodownEntryItemVo> getGodownSummaryReport(String startTime,String endTime,String suplier,String warehouseId,String type);
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r12942 -r12943
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 12942)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 12943)
@@ -46,6 +46,7 @@
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
@@ -703,7 +704,8 @@
 			
 			String suplierName = StrutsParamUtils.getPraramValue("suplierName", "");
 			String warehouseId = StrutsParamUtils.getPraramValue("warehouseId", ""); 
-			return jasperReportManager.getGodownSummaryReport(timeStart, timeEnd, suplierName,warehouseId);
+			String type = StrutsParamUtils.getPraramValue("warehouseId", GodownEntry.TYPE_IN); 
+			return jasperReportManager.getGodownSummaryReport(timeStart, timeEnd, suplierName,warehouseId,type);
 		}
 		return null;
 	}
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
===================================================================
diff -u -r12940 -r12943
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 12940)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 12943)
@@ -39,9 +39,10 @@
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<GodownEntryItem> getGodownEntryItemList(String startDateTime,
-			String endDateTime, String supplier,String orderField,String warehouseId) {
+			String endDateTime, String supplier,String orderField,String warehouseId,
+			String type) {
 		String sql = " where " + dateQueryAdapter.dateAreaSql("po.godownEntry.time", startDateTime, endDateTime);
-		sql += " and po.godownEntry.type = '" + GodownEntry.TYPE_IN + "'";
+		sql += " and po.godownEntry.type = '" + type + "'";
 		if(StringUtils.isNotBlank(supplier)){
 			sql += " and po.supplierName = '" + supplier + "'";
 		}