Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js
===================================================================
diff -u -r13078 -r13220
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js	(.../godownEntryDetailStatisticView.js)	(revision 13078)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js	(.../godownEntryDetailStatisticView.js)	(revision 13220)
@@ -175,7 +175,7 @@
 			}, {
 				layout : 'form',
 				labelWidth : 60,
-				columnWidth : .2,
+				columnWidth : .4,
 				items : [{        		
 					fieldLabel : '供应商',
 					xtype : 'combo',
@@ -235,7 +235,7 @@
 			},{
 				layout : 'form',
 				labelWidth : 60,
-				columnWidth : .2,
+				columnWidth : .4,
 				items : [{
 					fieldLabel : '物品名称',
 					xtype : 'combo',
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
===================================================================
diff -u -r13078 -r13220
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js	(.../godownEntryStatisticView.js)	(revision 13078)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js	(.../godownEntryStatisticView.js)	(revision 13220)
@@ -56,6 +56,7 @@
 			"&sheetId=" + reportParamSheetId +
 			"&unit=" + reportParamUnit +
 			"&type=" + type + 
+			"&suplierName=" + Ext.getCmp('suplierName').getValue() + 
 			"&goodsType=" + goodsType;
 		window.open(reportUrl, 'thisIframe','_self');
 	}
@@ -85,6 +86,20 @@
 		        ]
 	});
 	
+	var supplierStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getSupplierData.do?supplierType='+encodeURI(supplier),
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [
+		    {name : 'id',mapping : 'id'},
+		    {name : 'name',mapping : 'name'}
+		])
+	});
+	
 	var form = new Ext.form.FormPanel({
 		title : entityName,
 		region : 'north',
@@ -96,7 +111,7 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',
-		height : 105,
+		height : 130,
 		items : [{
 			layout : 'column',
 			height : 50,
@@ -171,6 +186,35 @@
 			},{
 				layout : 'form',
 				labelWidth : 60,
+				columnWidth : .4,
+				items : [{        		
+					fieldLabel : '供应商',
+					xtype : 'combo',
+					id : 'suplierName',
+					name : 'suplierName',
+					queryParam : 'supplierName',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					width : 600,
+					store : supplierStore,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '97%',
+					listeners : {
+						select : function(combo, record, index) {
+							Ext.getCmp('suplierName').setValue(record.data.name);
+						}
+					}
+				}]
+			
+			},{
+				layout : 'form',
+				labelWidth : 60,
 				columnWidth : .2,
 				items : [{
 					fieldLabel : '物品类型',
@@ -201,7 +245,7 @@
 			}, {
 				layout : 'form',
 				labelWidth : 60,
-				columnWidth : .2,
+				columnWidth : .4,
 				items : [{
 					fieldLabel : '关键字',
 					xtype : 'combo',
@@ -264,6 +308,7 @@
 				$Id('timeStart').value = "";
 				$Id('timeEnd').value = "";
 				Ext.getCmp('type').setValue('全部');
+				Ext.getCmp('suplierName').setValue("");
 				Ext.getCmp('goodsName').setValue("");
 				Ext.getCmp('goodsType').setValue('all');
 			}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13158 -r13220
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13158)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13220)
@@ -1329,7 +1329,9 @@
 						tousseTypeMap.put(tousseType,
 								(tousseTypeMap.get(tousseType) + tousseAmount));
 					}
+					if(amount != null && tousseAmount != null){
 					amount += tousseAmount;
+					}
 				}
 				Iterator<String> iterator = tousseTypeMap.keySet().iterator();
 				// 各类型包数量
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r13160 -r13220
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 13160)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 13220)
@@ -550,6 +550,8 @@
 			
 			String goodsName = StrutsParamUtils.getPraramValue("goodsName", "");
 			String type = StrutsParamUtils.getPraramValue("type", "");
+			//供应商
+			String suplierName = StrutsParamUtils.getPraramValue("suplierName", "");
 			String goodsType = StrutsParamUtils.getPraramValue("goodsType", "");
 			String filterSql1 = "";
 			String filterSql2 = "";
@@ -582,7 +584,7 @@
 			}
 			return jasperReportManager.getGodownEntryStatisticBean(title,
 					author, orgUnit, sheetId, unit, timeStart, timeEnd,
-					goodsName, filterSql1, filterSql2,null,goodsType);
+					goodsName, filterSql1, filterSql2,suplierName,goodsType);
 
 		}else if(reportName.equals("washWorkloadReprot")){ // 清洗器械物品工作量及不合格率汇总表
 			String month = StrutsParamUtils.getPraramValue("month", "");
@@ -1161,6 +1163,10 @@
 			String startDay = StrutsParamUtils.getPraramValue("timeStart", "");
 			String endDay = StrutsParamUtils.getPraramValue("timeEnd", "");
 			map.put("title", "入库物品统计报表("+startDay+"~"+endDay+")");
+			String suplierName = StrutsParamUtils.getPraramValue("suplierName", "");
+			if(StringUtils.isNotBlank(suplierName)){
+				map.put("suplierName", "供应商:" + suplierName);
+			}
 		}else if ("godownEntryDetailStatistic".equals(reportName)) {
 			String startDay = StrutsParamUtils.getPraramValue("timeStart", "");
 			String endDay = StrutsParamUtils.getPraramValue("timeEnd", "");
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.jsp
===================================================================
diff -u -r12331 -r13220
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.jsp	(.../godownEntryStatisticView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.jsp	(.../godownEntryStatisticView.jsp)	(revision 13220)
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="com.forgon.tools.SpringBeanManger" %>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%>
 <%@page import="com.forgon.directory.acegi.tools.AcegiHelper"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
@@ -25,6 +26,7 @@
 <script type="text/javascript">
 var username = '<%=AcegiHelper.getLoginUser().getUserFullName() %>';
 var orgUnit = '<%=supplyRoomConfigManager.getSystemParamsObj().getUnitName() %>';
+var supplier = '<%=Supplier.SUPPLIER_TYPE_SUPPLIER%>';//供货单位
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/godownEntryStatisticView.js"></script>
 <body>