Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r13110 -r13120 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13110) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13120) @@ -4200,6 +4200,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.materialInvoice_id " + + " and i.orgUnitCoding = '"+handleDeptCode+"' " + monthFilterSql + departFilterSql + materialNameFilterSql @@ -4209,6 +4210,7 @@ String materialReturnSql = " union all (select rr.depart as settleaccountsdepart,ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice),'材料' as type,'' " + " from ReturnMaterialRecord rr," + "ReturnMaterialItem ii where rr.id = ii.returnMaterialRecord_ID " + + " and rr.handleDepartCode = '"+handleDeptCode+"' " + returnGoodsTimeFilterSql + returnGoodsDepartFilterSql + materialNameFilterSql