Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r16585 -r16897 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 16585) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 16897) @@ -223,7 +223,10 @@ "po.returnStatus", SqlBuilder.IN, InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED); - + + String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE); + + switch(supplyRoomType){ case SupplyRoomConfig.SUPPLYROOM_TYPE_2: // 一级供应室 @@ -236,8 +239,8 @@ if (showAllApplicationOfTodayInTODOList) { sqlBuilder.append(String.format( - " AND ( (%s) OR (%s) OR (%s) )", deliverStatusSql, - returnStatusSql, todaySql)); + " AND ( (%s) OR (%s) OR (%s) OR (%s) )", deliverStatusSql, + returnStatusSql, todaySql, recyclingStatusSql)); } else { sqlBuilder.append(String.format(" AND ( (%s) OR (%s) )", deliverStatusSql, returnStatusSql));