Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r32318 -r32329
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 32318)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 32329)
@@ -2226,6 +2226,16 @@
 //打印一次性物品汇总
 function printDisposableGoodsInvoicePlanSummary(printType){
 	var inventorySerialNumber = printConfig.inventorySerialNumber || [];
+	if(parseInt(sstsConfig.printDisposableGoodsInvoicePlanSummaryUIVersion) !== 2){
+		if(inventorySerialNumber.length == 0){
+			showResult('请先在printConfig.js里面配置物资编码');
+			return;
+		}
+	}
+	var inventorySerialNumberString = '';
+	if(inventorySerialNumber.length > 0){
+		inventorySerialNumberString = inventorySerialNumber.join(';');
+	}
 	var records = top.Ext.getCmp('recordListStoreGrid').getSelectionModel().getSelections();
 	var printRecordIds = [];
 	if(records.length == 0){
@@ -2236,13 +2246,27 @@
 		var printRecordId = records[i].data.printRecordId;
 		printRecordIds[i] = printRecordId;
 	}
+	var startDate = '';
+	var endDate = '';
+	if(parseInt(sstsConfig.printDisposableGoodsInvoicePlanSummaryUIVersion) == 2){
+		var beginTime = top.Ext.getCmp('beginTime').getValue();
+		var endTime = top.Ext.getCmp('endDate').getValue();
+		if(!isUndefinedOrNullOrEmpty(beginTime)){
+			var time = date2string(new Date(beginTime))
+			startDate = time;
+		}
+		if(!isUndefinedOrNullOrEmpty(endTime)){
+			var time = date2string(new Date(endTime))
+			endDate = time;
+		}
+	}
 	top.Ext.MessageBox.progress('加载中', '请稍候...');
 	Ext.Ajax.request({
 		url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!printDisposableGoodsInvoicePlanSummary.do',
 		params : {
-			inventorySerialNumber:inventorySerialNumber.join(';'),
-			startDate:'',
-			endDate:'',
+			inventorySerialNumber:inventorySerialNumberString,
+			startDate:startDate,
+			endDate:endDate,
 			printRecordIds:printRecordIds.join(';')
 		},
 		success : function(response, options) {
@@ -2292,14 +2316,28 @@
 		{name : 'printRecordId'},
 	    {name : 'startTime'},
 	    {name : 'shift'},
+	    {name : 'disposableAmount'},
 	    {name : 'printUser'},
 	]),
 	listeners : {
 		beforeload: function(s,options){
-			var beginTime = top.Ext.getCmp('beginTime').getValue();
-			if(!isUndefinedOrNullOrEmpty(beginTime)){
-				var time = date2string(new Date(beginTime))
-				s.baseParams.startDate = time.split(' ')[0];
+			if(parseInt(sstsConfig.printDisposableGoodsInvoicePlanSummaryUIVersion) == 2){
+				var beginTime = top.Ext.getCmp('beginTime').getValue();
+				var endDate = top.Ext.getCmp('endDate').getValue();
+				if(!isUndefinedOrNullOrEmpty(beginTime)){
+					var time = date2string(new Date(beginTime))
+					s.baseParams.startDate = time;
+				}
+				if(!isUndefinedOrNullOrEmpty(endDate)){
+					var time = date2string(new Date(endDate))
+					s.baseParams.endDate = time;
+				}
+			}else {
+				var beginTime = top.Ext.getCmp('beginTime').getValue();
+				if(!isUndefinedOrNullOrEmpty(beginTime)){
+					var time = date2string(new Date(beginTime))
+					s.baseParams.startDate = time.split(' ')[0];
+				}
 			}
 		}
 	}
@@ -2310,12 +2348,89 @@
 	//获取开始时间、结束时间
 	var beginTime = "";
 	var endTime = "";
+	
+	var isHidden = false;
+	var searchForm = [{
+		columnWidth : 0.5,
+		layout : 'form',
+		labelWidth:70,
+		items : [ {
+			xtype : 'datefieldWithMin',
+			fieldLabel : '日期',
+			id : 'beginTime',
+			name : 'beginTime',
+			editable : false,
+			format : 'Y-m-d',
+			allowBlank : false,
+			anchor : '95%',
+			value: beginTime
+		}]
+	},{
+		columnWidth : 0.5,
+		layout : 'form',
+		labelWidth:70,
+		items : [{
+			xtype: 'button',
+			text: '查询',
+			iconCls: 'icon_search',
+			handler: function(){
+				recordListStore.load()
+			}
+		}]
+	}];
+	if(parseInt(sstsConfig.printDisposableGoodsInvoicePlanSummaryUIVersion) == 2){
+		isHidden = true;
+		searchForm = [{
+			columnWidth : 0.5,
+			layout : 'form',
+			labelWidth:120,
+			items : [ {
+				xtype : 'datefieldWithMin',
+				fieldLabel : '申请单打印时间介于',
+				id : 'beginTime',
+				name : 'beginTime',
+				editable : false,
+				format : 'Y-m-d H:i',
+				allowBlank : false,
+				anchor : '95%',
+				value: beginTime
+			}]
+		},{
+			columnWidth : 0.3,
+			layout : 'form',
+			labelWidth:25,
+			items : [ {
+				xtype : 'datefieldWithMin',
+				fieldLabel : '至',
+				id : 'endDate',
+				name : 'endDate',
+				labelSeparator: '',
+				editable : false,
+				format : 'Y-m-d H:i',
+				allowBlank : false,
+				anchor : '95%',
+				value: endTime
+			}]
+		},{
+			columnWidth : 0.2,
+			layout : 'form',
+			labelWidth:70,
+			items : [{
+				xtype: 'button',
+				text: '查询',
+				iconCls: 'icon_search',
+				handler: function(){
+					recordListStore.load()
+				}
+			}]
+		}];
+	}
 
 	var formPanel = new top.Ext.FormPanel({
 		id : 'form',
 		frame : true,
 		labelSeparator : '：',
-		labelAlign:'right',
+		labelAlign:isHidden?'center':'right',
 		autoHeight:true,
 		autoScroll : true,
 		items : [ {
@@ -2326,34 +2441,7 @@
 			bodyStyle : 'padding:5px 5px 0px 5px;',
 			style:'margin-bottom:0',
 			id:"tops",
-			items : [{
-				columnWidth : 0.5,
-				layout : 'form',
-				labelWidth:70,
-				items : [ {
-					xtype : 'datefieldWithMin',
-					fieldLabel : '日期',
-					id : 'beginTime',
-					name : 'beginTime',
-					editable : false,
-					format : 'Y-m-d',
-					allowBlank : false,
-					anchor : '95%',
-					value: beginTime
-				}]
-			},{
-				columnWidth : 0.5,
-				layout : 'form',
-				labelWidth:70,
-				items : [{
-					xtype: 'button',
-					text: '查询',
-					iconCls: 'icon_search',
-					handler: function(){
-						recordListStore.load()
-					}
-				}]
-			}]
+			items : searchForm
 		},{
 			columnWidth :1,
 			items:[new top.Ext.grid.GridPanel({
@@ -2362,9 +2450,10 @@
 				sm :new top.Ext.grid.CheckboxSelectionModel ({singleSelect : false}),
 				cm : new top.Ext.grid.ColumnModel([new top.Ext.grid.CheckboxSelectionModel ({singleSelect : false}),
 					{id : 'printRecordId',dataIndex : 'printRecordId',hidden : true},
-					{header : "打印开始时间",dataIndex : 'startTime',menuDisabled : true},
+					{header : isHidden?"最后打印时间":"打印开始时间",dataIndex : 'startTime',menuDisabled : true},
 					{header : "班次名称",dataIndex : 'shift',menuDisabled : true},
-					{header : "打印人",dataIndex : 'printUser',menuDisabled : true}
+					{header : "申请单数量",dataIndex : 'disposableAmount',menuDisabled : true,hidden:!isHidden},
+					{header : "打印人",dataIndex : 'printUser',menuDisabled : true,hidden:isHidden}
 			   	]),
 				height:200,
 				width:570,
@@ -2411,14 +2500,25 @@
 		items : [ formPanel ]
 	});
 
+	var dateformat = 'yyyy-MM-dd';
+	if(parseInt(sstsConfig.printDisposableGoodsInvoicePlanSummaryUIVersion) == 2){
+		dateformat = 'yyyy-MM-dd HH:mm';
+	}
+
 	Ext.Ajax.request({
 		url:  WWWROOT + '/system/serverTimeAction!getCurrentTime.do',
-		params: {dateformat: 'yyyy-MM-dd'},
+		params: {dateformat: dateformat},
 		success: function(response, options) {
 			var result = Ext.decode(response.responseText);
 			if (result.success) {
 				var startDateTime = result.data.startDateTime;
-				top.Ext.getCmp('beginTime').setValue(startDateTime);
+				var endDateTime = result.data.endDateTime;
+				if(parseInt(sstsConfig.printDisposableGoodsInvoicePlanSummaryUIVersion) == 2){
+					top.Ext.getCmp('beginTime').setValue(startDateTime.split(' ')[0] + ' 00:00');
+					top.Ext.getCmp('endDate').setValue(endDateTime);
+				}else {
+					top.Ext.getCmp('beginTime').setValue(startDateTime);
+				}
 				printRecordListWin.show();
 				recordListStore.load()
 			} else {
Index: ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
===================================================================
diff -u -r32326 -r32329
--- ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js	(.../config.js)	(revision 32326)
+++ ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js	(.../config.js)	(revision 32329)
@@ -285,5 +285,7 @@
 //PC端发货计划模块开始日期和结束日期的时间控件格式
     timeSearchFmt : 'Y-m-d H:i',
 // 是否显示装配界面的打印按钮
-  packingView_currentTaskGroup_showPrintBtn:false	
+  packingView_currentTaskGroup_showPrintBtn:false,
+//打印一次性物品汇总单的UI界面的版本
+  printDisposableGoodsInvoicePlanSummaryUIVersion:2
 }
\ No newline at end of file