Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13109 -r13110
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13109)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13110)
@@ -3719,10 +3719,10 @@
 		// 材料发货价格
 		String materialInvoicePriceSql = "select '' as coding,min(i.settleAccountsDepart) "
 				   + "as depart,sum(ii.settlementPrice) as price from MaterialInvoice i,"
-				   + "MaterialInvoiceItem ii where i.id = ii.materialInvoiceId and  i.orgUnitCoding = '" + handleDeptCode + "' " + invoiceWheresql + " group by i.settleAccountsDepart";
+				   + "MaterialInvoiceItem ii where i.id = ii.materialInvoice_id and  i.orgUnitCoding = '" + handleDeptCode + "' " + invoiceWheresql + " group by i.settleAccountsDepart";
 		ResultSet materialInvoicePriceResultSet = objectDao.executeSql(materialInvoicePriceSql);
 		try {
-			while(rs.next()){
+			while(materialInvoicePriceResultSet.next()){
 				String code = materialInvoicePriceResultSet.getString(1);
 				String dept = materialInvoicePriceResultSet.getString(2);
 				Double price = materialInvoicePriceResultSet.getDouble(3);
@@ -3758,7 +3758,7 @@
 		}
 		// 材料发货数量
 		String materialInvoiceAmountSql = "select '' as coding,i.settleAccountsDepart "
-				   + "as depart,mi.amount from MaterialInvoice i inner join MaterialInvoiceItem mi on i.id=mi.materialInvoiceId "
+				   + "as depart,mi.amount from MaterialInvoice i inner join MaterialInvoiceItem mi on i.id=mi.materialInvoice_id "
 				   + "where i.orgUnitCoding = '" + handleDeptCode + "' "
 				   + " and (mi.amount is not null and mi.amount>0) "
 				   + " " + invoiceWheresql;
@@ -3918,7 +3918,7 @@
 		}
 		ResultSet materialReturnResultSet = objectDao.executeSql(materialReturnSql);
 		try {
-			while(rs5.next()){
+			while(materialReturnResultSet.next()){
 				String code = materialReturnResultSet.getString(1);
 				String dept = materialReturnResultSet.getString(2);
 				Double price = materialReturnResultSet.getDouble(3);
@@ -4199,7 +4199,7 @@
 		// 材料发货
 		String materialInvoiceSql = " union all (select i.settleAccountsDepart,ii.materialName,sum(ii.amount),sum(ii.settlementPrice),'材料' as type,'' "
 				   	+ " from MaterialInvoice i,"
-				   	+ "MaterialInvoiceItem ii where i.id = ii.materialInvoiceId " 
+				   	+ "MaterialInvoiceItem ii where i.id = ii.materialInvoice_id " 
 				   	+ monthFilterSql
 				   	+ departFilterSql
 				   	+ materialNameFilterSql