Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r29513 -r29659
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 29659)
@@ -115,7 +115,11 @@
     padding-right: 0px;
     height:30px;
     line-height:30px;
+	vertical-align:middle !important;
 }
+#tops {
+	margin-bottom: 0 !important;
+}
 </style>
 <%@ include file="/common/include_Ext2_Css.jsp"%>
 <%@ include file="/common/include_Ext2_Js.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r29553 -r29659
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29553)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29659)
@@ -2203,22 +2203,29 @@
 
 //打印一次性物品汇总
 function printDisposableGoodsInvoicePlanSummary(printType){
-	var beginTime = Ext.getCmp('beginTime').getValue();
-	var endTime = Ext.getCmp('endTime').getValue();
 	var inventorySerialNumber = printConfig.inventorySerialNumber || [];
 	if(inventorySerialNumber.length == 0){
 		showResult('请先在printConfig.js里面配置物资编码');
 		return;
 	}
-	beginTime = date2string(new Date(beginTime));
-	endTime = date2string(new Date(endTime));
+	var records = Ext.getCmp('recordListStoreGrid').getSelectionModel().getSelections();
+	var printRecordIds = [];
+	if(records.length == 0){
+		showResult('请至少选择一条批次');
+		return;
+	}
+	for(var i=0;i<records.length;i++){
+		var printRecordId = records[i].data.printRecordId;
+		printRecordIds[i] = printRecordId;
+	}
 	top.Ext.MessageBox.progress('加载中', '请稍候...');
 	Ext.Ajax.request({
 		url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!printDisposableGoodsInvoicePlanSummary.do',
 		params : {
 			inventorySerialNumber:inventorySerialNumber.join(';'),
-			startDate:beginTime,
-			endDate:endTime
+			startDate:'',
+			endDate:'',
+			printRecordIds:printRecordIds.join(';')
 		},
 		success : function(response, options) {
 			var obj = Ext.decode(response.responseText);
@@ -2255,6 +2262,42 @@
 	});
 }
 
+var sm = new Ext.grid.CheckboxSelectionModel({
+	singleSelect : false
+});
+
+var tousseCm = new Ext.grid.ColumnModel([sm,
+	{id : 'printRecordId',dataIndex : 'printRecordId',hidden : true},
+	{header : "打印开始时间",dataIndex : 'startTime',menuDisabled : true},
+	{header : "班次名称",dataIndex : 'shift',menuDisabled : true},
+	{header : "打印人",dataIndex : 'printUser',menuDisabled : true}
+]);
+
+var recordListStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/invoicePlanPrintRecordAction!findInvoicePlanPrintRecordList.do',
+		method : 'POST'
+	}),
+	reader: new Ext.data.JsonReader({
+		totalProperty: 'totalCount',
+		root: 'data'
+	}, [
+		{name : 'printRecordId'},
+	    {name : 'startTime'},
+	    {name : 'shift'},
+	    {name : 'printUser'},
+	]),
+	listeners : {
+		beforeload: function(s,options){
+			var beginTime = Ext.getCmp('beginTime').getValue();
+			if(!isUndefinedOrNullOrEmpty(beginTime)){
+				var time = date2string(new Date(beginTime))
+				s.baseParams.startDate = time.split(' ')[0];
+			}
+		}
+	}
+});
+
 //打印一次性物品汇总单的过滤条件
 function printDisposableGoodsInvoicePlanSummaryWindow(){
 	//获取开始时间、结束时间
@@ -2266,22 +2309,26 @@
 		frame : true,
 		labelSeparator : '：',
 		labelAlign:'right',
-		bodyStyle : 'padding:5px 5px 0px 5px',
 		autoHeight:true,
 		autoScroll : true,
 		items : [ {
+			xtype : "fieldset",
+			title : "一次性物品的批量打印批次",
 			layout : 'column',
-			items : [ {
+			autoHeight : true,
+			bodyStyle : 'padding:5px 5px 0px 5px;',
+			id:"tops",
+			items : [{
 				columnWidth : 0.5,
 				layout : 'form',
 				labelWidth:70,
 				items : [ {
 					xtype : 'datefieldWithMin',
-					fieldLabel : '开始时间',
+					fieldLabel : '日期',
 					id : 'beginTime',
 					name : 'beginTime',
 					editable : false,
-					format : 'Y-m-d H:i:s',
+					format : 'Y-m-d',
 					allowBlank : false,
 					anchor : '95%',
 					value: beginTime
@@ -2291,17 +2338,28 @@
 				layout : 'form',
 				labelWidth:70,
 				items : [{
-					xtype : 'datefieldWithMin',
-					fieldLabel : '结束时间',
-					id : 'endTime',
-					name : 'endTime',
-					editable : false,
-					format : 'Y-m-d H:i:s',
-					allowBlank : false,
-					anchor : '95%',
-					value: endTime
+					xtype: 'button',
+					text: '查询',
+					iconCls: 'icon_search',
+					handler: function(){
+						recordListStore.load()
+					}
 				}]
 			}]
+		},{
+			columnWidth :1,
+			items:[new Ext.grid.EditorGridPanel({
+				id : 'recordListStoreGrid',
+				store : recordListStore,
+				cm : tousseCm,
+				height:200,
+				bodyStyle : 'border:1px solid #afd7af;border-top:0',
+				frame : false,
+				viewConfig: {
+					forceFit:true
+				},
+				selModel :sm
+			})]
 		} ],
 		buttons : [{
 			id : 'printView',
@@ -2319,13 +2377,13 @@
 			id : 'cancel',
 			text : '取消',
 			handler : function(){
-				chooseRecyclingDetailWin.close();
+				printRecordListWin.close();
 			}
 		}]
 	});
 	
-	var chooseRecyclingDetailWin = new Ext.Window( {
-		id : 'chooseRecyclingDetailWin',
+	var printRecordListWin = new Ext.Window( {
+		id : 'printRecordListWin',
 		layout : 'fit',
 		title : '打印一次性物品汇总单 ',
 		width : 600,
@@ -2337,16 +2395,15 @@
 	});
 
 	Ext.Ajax.request({
-		url:  WWWROOT + '/system/serverTimeAction!getCurrentTime.do?beforeTime=20',
-		params: {dateformat: 'yyyy-MM-dd HH:mm:ss'},
+		url:  WWWROOT + '/system/serverTimeAction!getCurrentTime.do',
+		params: {dateformat: 'yyyy-MM-dd'},
 		success: function(response, options) {
 			var result = Ext.decode(response.responseText);
 			if (result.success) {
 				var startDateTime = result.data.startDateTime;
-				var endDateTime = result.data.endDateTime;
 				Ext.getCmp('beginTime').setValue(startDateTime);
-				Ext.getCmp('endTime').setValue(endDateTime)
-				chooseRecyclingDetailWin.show();
+				printRecordListWin.show();
+				recordListStore.load()
 			} else {
 				showResult(result.message);
 			}
@@ -2965,7 +3022,7 @@
 							}
 						}	
 					},{
-                        text: '打印一次性物品汇总单',hidden: !sstsConfig.printDisposableGoodsInvoicePlanSummary, handler: function () {
+                        text: '打印一次性物品汇总单', handler: function () {
 							printDisposableGoodsInvoicePlanSummaryWindow()
 						}
                     }]