Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r13291 -r13293 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13291) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13293) @@ -7696,7 +7696,7 @@ } //供应室领用 - String supplyRoomDiposableGoodsSql = " select dg.name,dg.specification,rri.price as cost,rri.amount" + String supplyRoomDiposableGoodsSql = " select dg.name,dg.specification,rri.price as cost,rri.amount," + "'" + GodownEntry.TYPE_OUT + "' as type,'供应室领用' as subType" +" from " + ReceiveRecord.class.getSimpleName() + " rr left join " + ReceiveRecordItem.class.getSimpleName() + " rri on rr.id = rri.receiveRecord_id"