Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27758 -r27774
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27758)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27774)
@@ -11737,7 +11737,7 @@
 		if(currentRecord != null){
 			String projectName = CssdUtils.getProjectName();
 			
-			ResultSet rs;
+			ResultSet rs = null;
 			//计算期末
 			calcStockTakeRecord(currentRecord, type, service,false);
 			//计算期初
@@ -11835,11 +11835,11 @@
 			sql += " union all " + packingRecordUsedSql;
 			sql += " union all " + returnGoodsSql;
 			//System.out.println(sql);
-			rs = objectDao.executeSql(sql);
 			try {
 				//查出该时间内各一次性物品最后入库的供应商
 				Map<String,String> disposableGoodsLastEntrySupplierMap = 
 						godownEntryItemManager.getDisposableGoodsLastEntrySupplierMap(startDate,endDate);
+				rs = objectDao.executeSql(sql);
 				while(rs.next()){
 					JSONObject item = new JSONObject();
 					String name = rs.getString("name");