Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r20092 -r20123 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 20092) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 20123) @@ -229,6 +229,9 @@ InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED); + //不发货的单,今天处理完,也要在科室申领那里显示出来 + deliverStatusSql = String.format("(%s or po.deliverStatus='' or po.deliverStatus is null)", deliverStatusSql); + String returnStatusSql = SqlBuilder.build_IN_Statement( "po.returnStatus", SqlBuilder.IN, InvoicePlan.RETURN_STATUS_UNRETURNED, @@ -241,6 +244,7 @@ case SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM: // 一级供应室 case SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM:{ + //未处理完的单和今天处理完的单 if("todoList".equals(listType)){ boolean showAllApplicationOfTodayInTODOList = true;