Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r16581 -r16592
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 16581)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 16592)
@@ -421,8 +421,9 @@
 			return jasperReportManager.getWorkQualityCollectionList(null, null,null,
 					month);
 		} else if (reportName.equals("supplyRoomApplianceMonthStatistics")) {// 器械月盘点报表
-			String id = StrutsParamUtils.getPraramValue("id", null);
-			return jasperReportManager.getSupplyRoomMaterialStocktakingList(id);
+			String startDate = StrutsParamUtils.getPraramValue("startDate", null);
+			Long warehouseId = StrutsParamUtils.getPraramLongValue("warehouseId", null);
+			return jasperReportManager.getSupplyRoomMaterialStocktakingList(startDate,warehouseId);
 		}else if (reportName.equals("monthReport")) {//核算月报
 			String startDate = StrutsParamUtils.getPraramValue("startTime",null);
 			String endDate = StrutsParamUtils.getPraramValue("endTime",null);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManager.java
===================================================================
diff -u -r13124 -r16592
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManager.java	(.../MaterialCheckManager.java)	(revision 13124)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManager.java	(.../MaterialCheckManager.java)	(revision 16592)
@@ -17,6 +17,6 @@
 	
 	public MaterialCheckRecord getMaterialCheckRecord(String inventoryRecirdId);
 	
-	public List<SupplyRoomMaterialStocktaking> getMaterialStockList(String inventoryRecirdId);
+	public List<SupplyRoomMaterialStocktaking> getMaterialStockList(String inventoryDate,Long warehouseId);
 	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp
===================================================================
diff -u -r13124 -r16592
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp	(.../supplyRoomApplianceMonthStatisticsView.jsp)	(revision 13124)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp	(.../supplyRoomApplianceMonthStatisticsView.jsp)	(revision 16592)
@@ -9,8 +9,9 @@
 <script type="text/javascript" src="${ctx }/dwr/interface/ReportFormsCenterTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDatePicker.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDateField.js"></script>
+<!-- 日期控件引入 -->
+<link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
+<script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.js"></script>
 
 <script type="text/javascript">
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.js
===================================================================
diff -u -r16580 -r16592
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.js	(.../supplyRoomApplianceMonthStatisticsView.js)	(revision 16580)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.js	(.../supplyRoomApplianceMonthStatisticsView.js)	(revision 16592)
@@ -4,98 +4,135 @@
 var myMask;
 Ext.onReady(function() {
 	Ext.QuickTips.init();
-	// 记录cookie（3步）
 	
-	
 	function reloadReport(){
+		var startDate =  $Id('startDate').value;
+		if(startDate == ""){
+			showResult("盘点日期不能为空！");
+			return false;
+		}
+		var warehouseId = Ext.getCmp('wareHouseName').getValue();
+		if(warehouseId == ""){
+			showResult("仓库不能为空！");
+			return false;
+		}
 		
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
 		});
 		myMask.show();
-		window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=supplyRoomApplianceMonthStatistics.jasper&id=" + inventoryRecordId + "&reportName=supplyRoomApplianceMonthStatistics",'thisIframe','_self');
-	}	
-		var sign = true;
-		var dwrCallParams = null;
-		
-		var tbar = [{
-			text : '导出Excel',
-			iconCls : 'btn_ext_refresh',
-			id : 'editTbar',
-			handler : function() {
-				var month = Ext.getCmp('monthSearch').getRawValue();
-				location.href=WWWROOT + "/disinfectsystem/reportforms/departmentMonthlyExport.jsp?month="+month+"&reportType=科室月报明细";
-			}
-		} ];
-
-		Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
-
-		};
-		
-		var departJsonStore = new Ext.data.SimpleStore({
-			fields : [ 'departName' ],
-			url : WWWROOT + '/disinfectSystem/reportFormsCenterAction!getAllDepartName.do'
-		});
-		
-		var form = new Ext.form.FormPanel({
-			title : entityName + "月报",
-			region : 'north',
-			labelAlign : 'right',
-			buttonAlign : 'center',
-			collapsible : true,
-			collapseMode : 'mini',
-			split : true,
-			border : 0,
-			frame : true,
-			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 105,
-			items : [{
-				layout : 'column',
-				height : 40,
-				labelWidth : 70
-			}],
-			buttons:[{
-				xtype : 'button',
-				text : '查询',
-				minWidth : 70,
-				iconCls : 'icon_search',
-				handler : function() {
-					reloadReport();
+		window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=supplyRoomApplianceMonthStatistics.jasper&startDate=" + startDate + "&warehouseId=" + warehouseId + "&reportName=supplyRoomApplianceMonthStatistics",'thisIframe','_self');
+	}
+	
+	var wareHouseStore = new Ext.data.JsonStore({
+		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
+	    root: 'data',
+	    fields: [ 
+	        {name : 'id',mapping : 'id'},
+	  		{name : 'name',mapping : 'name'}
+	    ],
+	    listeners : {
+			load : function(store,records) {
+				if(records.length > 0 && Ext.getCmp("wareHouseName").getRawValue() == "") {
+					Ext.getCmp("wareHouseName").setValue(records[0].data.id);
 				}
+			}
+		}
+	});
+	
+	var form = new Ext.form.FormPanel({
+		title : entityName + "月报",
+		region : 'north',
+		labelAlign : 'right',
+		buttonAlign : 'center',
+		collapsible : true,
+		collapseMode : 'mini',
+		split : true,
+		border : 0,
+		frame : true,
+		bodyStyle : 'padding:0px auto;margin:0px',
+		height : 105,
+		items : [{
+			layout : 'column',
+			height : 40,
+			labelWidth : 60,
+			items:[{
+				width : 220,
+				layout : 'form',
+				labelWidth : 40,
+				items : [{
+					xtype : 'combo',
+					fieldLabel : '仓库',
+					id : 'wareHouseName',
+					name : 'wareHouseName',
+					editable:false,
+					valueField : 'id',
+					displayField : 'name',
+					store : wareHouseStore,
+					forceSelection : true,
+					lazyInit : false,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '95%'
+				}]
 			},{
-				xtype : 'button',
-				text : '重置',
-				minWidth : 70,
-				iconCls : 'icon_set',
-				handler : function() {
-				}
-			}]
-		});
-		
-		
-		var reportForm = new Ext.Panel({
-	         frame:false,//渲染面板
-	         autoScroll:true,//自动显示滚动条   
-	         collapsible:true,//允许展开和收缩   
-	         bodyPadding:5,
-	         html:'<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe>'
-		});
-		
-		
-		var viewport = new Ext.Viewport({
-			layout : 'border',
-			items : [form, {
-				id:'reportPanel',
-				region : 'center',
-				margins : '0 0 0 0',
-				layout : 'fit',
-				items : reportForm
-			}]
-		});
-		
-		/*if(param_month && param_month != ""){
-			Ext.getCmp('monthSearch').setValue(param_month);
-		}*/
+				width : 210,
+				layout : 'form',
+				labelWidth : 60,
+				items : [{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '盘点日期',
+					id : 'startDate',
+					name : 'startDate',
+					editable : false,
+					format : 'Y-m-d',
+					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+					allowBlank : false,
+					anchor : '95%',
+					value: new Date()
+				}]
+			}]				
+		}],
+		buttons:[{
+			xtype : 'button',
+			text : '查询',
+			minWidth : 70,
+			iconCls : 'icon_search',
+			handler : function() {
+				reloadReport();
+			}
+		},{
+			xtype : 'button',
+			text : '重置',
+			minWidth : 70,
+			iconCls : 'icon_set',
+			handler : function() {
+				Ext.getCmp('startDate').setValue('');
+			}
+		}]
+	});
 	
-	});
\ No newline at end of file
+	
+	var reportForm = new Ext.Panel({
+         frame:false,//渲染面板
+         autoScroll:true,//自动显示滚动条   
+         collapsible:true,//允许展开和收缩   
+         bodyPadding:5,
+         html:'<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe>'
+	});
+	
+	var viewport = new Ext.Viewport({
+		layout : 'border',
+		items : [form, {
+			id:'reportPanel',
+			region : 'center',
+			margins : '0 0 0 0',
+			layout : 'fit',
+			items : reportForm
+		}]
+	});
+	wareHouseStore.load();
+});
\ No newline at end of file
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r16176 -r16592
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 16176)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 16592)
@@ -187,7 +187,7 @@
 			String year, String type,String querySupplyRoom,String month) throws ParseException,
 			SQLException;
 
-	public List<SupplyRoomMaterialStocktaking> getSupplyRoomMaterialStocktakingList(String id);
+	public List<SupplyRoomMaterialStocktaking> getSupplyRoomMaterialStocktakingList(String startDate,Long warehouseId);
 
 	public List<MaterialWashUnqualifiedPosition> getmaterialWashUnqualifiedPositionBean(
 			String startDay, String endDay);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r16496 -r16592
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16496)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16592)
@@ -6949,10 +6949,10 @@
 	 * 供应室器械月盘点报表数据
 	 */
 	@Override
-	public List<SupplyRoomMaterialStocktaking> getSupplyRoomMaterialStocktakingList(String id) {
+	public List<SupplyRoomMaterialStocktaking> getSupplyRoomMaterialStocktakingList(String startDate,Long warehouseId) {
 		List<SupplyRoomMaterialStocktaking> smtList = new ArrayList<SupplyRoomMaterialStocktaking>();
-		if(StringUtils.isNotBlank(id)){
-			return materialCheckManager.getMaterialStockList(id);
+		if(StringUtils.isNotBlank(startDate) && warehouseId != null){
+			return materialCheckManager.getMaterialStockList(startDate, warehouseId);
 		}
 		return smtList;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
===================================================================
diff -u -r15743 -r16592
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java	(.../MaterialCheckManagerImpl.java)	(revision 15743)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java	(.../MaterialCheckManagerImpl.java)	(revision 16592)
@@ -9,12 +9,15 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.commons.lang.StringUtils;
+
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialCheck;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialCheckRecord;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
+import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockTakeRecord;
 import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
@@ -127,12 +130,30 @@
 		String sql = "where po.id < "+id+" and po.warehouseId = " + warehouseId +" order by id desc";
 		return (MaterialCheckRecord)objectDao.getBySql(MaterialCheckRecord.class.getSimpleName(), sql);
 	}
+	
+	private MaterialCheckRecord getMaterialCheckRecord(String inventoryDate,Long warehouseId){
+		if(StringUtils.isNotBlank(inventoryDate) && warehouseId != null){
+			String startDate = dateQueryAdapter.dateAdapter(inventoryDate + " 00:00:00");
+			String endDate = dateQueryAdapter.dateAdapter(inventoryDate + " 23:59:59");
+			String sql = "where po.date between "+startDate+" and " + endDate + " and po.warehouseId = "+warehouseId+" order by po.id desc";
+			@SuppressWarnings("unchecked")
+			List<MaterialCheckRecord> list = objectDao.findBySql(MaterialCheckRecord.class.getSimpleName(), sql);
+			if(list != null && list.size() > 0){
+				return list.get(0);
+			}
+		}
+		return null;
+	}
 
+	/**
+	 * inventoryDate 盘点日期
+	 * warehouseId 仓库id
+	 */
 	@Override
-	public List<SupplyRoomMaterialStocktaking> getMaterialStockList(String inventoryRecirdId) {
+	public List<SupplyRoomMaterialStocktaking> getMaterialStockList(String inventoryDate,Long warehouseId) {
 		List<SupplyRoomMaterialStocktaking> smtList = new ArrayList<SupplyRoomMaterialStocktaking>();
-		if(StringUtils.isNotBlank(inventoryRecirdId)){
-			MaterialCheckRecord record = getMaterialCheckRecord(inventoryRecirdId);
+		if(StringUtils.isNotBlank(inventoryDate)){
+			MaterialCheckRecord record = getMaterialCheckRecord(inventoryDate,warehouseId);
 			if(record != null){
 				MaterialCheckRecord lastRecord = getLastMaterialCheckRecord(record.getId(),record.getWarehouseId());
 				List<MaterialCheck> list = record.getItems();