Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15324 -r15343
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15324)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15343)
@@ -10901,7 +10901,7 @@
 			}
 
 			//供应室领用
-			String supplyRoomDiposableGoodsSql = " select dg.name,dg.specification,rri.price as cost,rri.amount," 
+			String supplyRoomDiposableGoodsSql = " select dg.name,dg.specification,rri.amount,rri.price as cost," 
 					+ "'" + GodownEntry.TYPE_OUT + "' as type,'供应室领用' as subType" 
 					+" from " + ReceiveRecord.class.getSimpleName() + " rr left join " 
 					+ ReceiveRecordItem.class.getSimpleName() + " rri on rr.id = rri.receiveRecord_id"
@@ -10917,7 +10917,7 @@
 				supplyRoomDiposableGoodsSql += " and dg.type = '" + type + "' ";
 			}
 			//装配扣减,暂时算到供应室领用
-			String packingRecordUsedSql = " select dg.name,dg.specification,dgi.price as cost,dgi.amount,"
+			String packingRecordUsedSql = " select dg.name,dg.specification,dgi.amount,dgi.price as cost,"
 					+ "'" + GodownEntry.TYPE_OUT + "' as type,'供应室领用' as subType" 
 					+" from " + PackingRecord.class.getSimpleName() + " pr left join " 
 					+ PackingRecordOutItem.class.getSimpleName() + " pri on pr.id = pri.packingRecordId"