Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
===================================================================
diff -u -r12911 -r12945
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js	(.../godownEntrySummaryView.js)	(revision 12911)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js	(.../godownEntrySummaryView.js)	(revision 12945)
@@ -1,4 +1,4 @@
-var entityName = "入库物品统计报表(按供应商)";
+var entityName = "入/退库物品统计报表(按供应商)";
 var grid;
 
 var reportParamTitle = '入库物品统计报表';
@@ -34,6 +34,12 @@
 	    {name : 'name',mapping : 'name'}
 	])
 });
+
+var typeStore = new Ext.data.SimpleStore({
+	fields : ['type'],
+	data : [[godownTypeIn],[godownTypeOut]]
+});
+
 function formatDate(date){
 	if(date instanceof Date){
 		var day=date.getDate()
@@ -48,6 +54,7 @@
 	var timeEnd= Ext.getCmp('timeEnd').value;
 	var suplierName = Ext.getCmp('suplierName').value;
 	var warehouseId = Ext.getCmp('wareHouse').getValue();
+	var godownType = Ext.getCmp('godownType').getValue();
 	var paramStr = "jasperreportName=godownEntrySummary.jasper" + "&reportName=godownEntrySummary";
 	if(timeStart && timeEnd){
 		paramStr += "&timeStart=" + formatDate(timeStart);
@@ -56,7 +63,12 @@
 	if(suplierName){
 		paramStr += "&suplierName=" + suplierName;
 	}
-	
+	if(godownType){
+		paramStr += "&type=" + godownType;
+	}
+	if(godownType == godownTypeOut){
+		reportParamTitle = "退库物品统计报表";
+	}
 	paramStr += "&title=" + reportParamTitle;
 	paramStr += "&orgUnit=" + orgUnit;
 	paramStr += "&warehouseId=" + warehouseId;
@@ -250,6 +262,27 @@
 					allowBlank : true,
 					anchor : '95%'
 				}]				
+			},{
+				layout : 'form',
+				labelWidth : 60,
+				columnWidth : .2,
+				items:[{
+					xtype : 'combo',
+					fieldLabel : '单类型',
+					id : 'godownType',
+					name : 'godownType',
+					minChars : 0,
+					valueField : 'type',
+					displayField : 'type',
+					mode : 'local',
+					store : typeStore,
+					value : godownTypeIn,
+					allowBlank : false,
+					typeAhead : true,  
+					forceSelection : true,  
+					triggerAction : 'all',
+					anchor : '95%'
+				}]				
 			}]
 		}],
 		buttons:[{
@@ -299,6 +332,6 @@
 			items : reportForm
 		}]
 	});
-	
-	
+	//默认选中第一项(前面已经指定combo的value属性默认值,所以这一行暂时注释)
+	//Ext.getCmp("godownType").setValue(Ext.getCmp("godownType").store.getAt(0).get('type') );
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r12937 -r12945
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 12937)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 12945)
@@ -400,7 +400,7 @@
     	{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
     	{hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_GodownEntryStatistic,text:"入库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_GodownEntryStatistic,text:"入库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_GodownEntryStatistic,text:"入库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp
===================================================================
diff -u -r12640 -r12945
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp	(.../godownEntrySummaryView.jsp)	(revision 12640)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp	(.../godownEntrySummaryView.jsp)	(revision 12945)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="com.forgon.tools.SpringBeanManger" %>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
@@ -27,6 +28,9 @@
 var username = '<%=AcegiHelper.getLoginUser().getUserFullName() %>';
 var orgUnit = '<%=supplyRoomConfigManager.getSystemParamsObj().getUnitName() %>';
 var supplier = '<%=Supplier.SUPPLIER_TYPE_SUPPLIER%>';//供货单位
+//入库单与退库单
+var godownTypeIn = '<%=GodownEntry.TYPE_IN %>';
+var godownTypeOut = '<%=GodownEntry.TYPE_OUT %>';
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/godownEntrySummaryView.js"></script>
 <body>