Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
===================================================================
diff -u -r18775 -r20299
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 18775)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 20299)
@@ -90,8 +90,8 @@
         String whereSql = String.format(" from TousseItem po join invoicePlan ip on po.RecyclingApplication_id = ip.id " +
                 " left join RecyclingRecord rr on rr.recyclingApplication_id = ip.id" +
                 " left join RecyclingItem ri on rr.id = ri.recyclingRecord_id and ri.tousseDefinitionId = po.toussedefinitionid "
-                + " where ip.type in (%s) and ip.applicationTime between %s and %s "
-                + " and ip.committedStatus = 1 and (ip.recyclingStatus != '%s' or ip.recyclingStatus is null)", SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, startDateStr, endDateStr, InvoicePlan.STATUS_END);
+                + " where ip.type in (%s) and (ip.applicationTime between %s and %s or ip.recyclingTime between %s and %s) "
+                + " and ip.committedStatus = 1 and (ip.recyclingStatus != '%s' or ip.recyclingStatus is null)", SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, startDateStr, endDateStr, startDateStr, endDateStr, InvoicePlan.STATUS_END);
         //因为自定义回收的不产生申请单，所以RecyclingRecord的recyclingApplication_id是为空,因此要union上RecyclingRecord表中rr.recyclingApplication_id为空的数据
         String unionWhere = this.buildUnionSql(supplyRoomVo);
         whereSql += " union " + unionWhere + ") po where 1=1 ";
Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r19517 -r20299
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 19517)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 20299)
@@ -452,7 +452,7 @@
 	    	 {header : "申请数量",width : 60,dataIndex : 'amount'}, 
 	    	 {header : "回收数量",width : 60,dataIndex : 'recyclingAmount'}, 
 	    	 {header : "申请单类型",width : 180,dataIndex : 'formType', hidden : true},
-	    	 {header : "回收清洗筐",width : 240,dataIndex : 'basketName'},
+	    	 {header : "回收清洗筐",width : 140,dataIndex : 'basketName'},
 			 {header : "加急数量",width : 110,dataIndex : 'urgentAmount',hidden:sstsConfig.isHideUrgentAmount === undefined || sstsConfig.isHideUrgentAmount},
 			 {header : "发货数量",width : 110,dataIndex : 'sendOutAmount'},
 		     {header : "科室",width : 110,dataIndex : 'depart'},
@@ -464,7 +464,7 @@
 		     {header : "申请人",width : 130,dataIndex : 'applicant',hidden:true},
 		     {header : "结算科室",width : 130,dataIndex : 'settleAccountsDepart',hidden:true},
 		     {header : "打印时间",width : 110,dataIndex : 'printTime'},
-		     {header : "备注",width : 110,dataIndex : 'remark'}
+		     {header : "备注",width : 110,dataIndex : 'remark',id:'autoWidth'}
 		     
 	    ]);
 	   
@@ -664,6 +664,7 @@
 			cm : applicationColumns,
 			bbar:applicationPageBbar,
 			bodyStyle: "overflow:auto;",
+			autoExpandColumn : 'autoWidth',
 			listeners :{
 				beforerender   :function(thiz){
 					var tempGrid = Ext.getCmp('reportFormID');