Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r14986 -r14991 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14986) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14991) @@ -284,7 +284,9 @@ String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus",InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE); //发货状态:待发货,部分发货 String deliverStatusSql = SqlBuilder.createStatus("deliverStatus",InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED); - sqlBuilder.append(String.format(" AND (%s or %s ) ",deliverStatusSql,recyclingStatusSql)); + //归还状态:未归还,部分归还 + String returnStatusSql = SqlBuilder.createStatus("returnStatus",InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED); + sqlBuilder.append(String.format(" AND (%s or %s or %s ) ",deliverStatusSql,recyclingStatusSql,returnStatusSql)); }