Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r14181 -r14188 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14181) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14188) @@ -8428,7 +8428,7 @@ //退库sql - String outsql = basesql + " and r.type ='"+GodownEntry.TYPE_OUT+"' and r.warehouseID = " + String outsql = basesql + " and r.type ='"+GodownEntry.TYPE_OUT+"' and subType not in ('"+GodownEntry.SUBTYPE_MOVE_OUT+"','"+GodownEntry.SUBTYPE_STOCKTAKE_OUT+"') and r.warehouseID = " + currentRecord.getWarehouseId(); if(StringUtils.isBlank(startDate)){ outsql += " and r.time < " + endDate + "";