Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r15222 -r15359
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 15222)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 15359)
@@ -285,6 +285,7 @@
 
 	/**
 	 * 创建未完成条件过滤
+     * (新加发货状态为null是也属于未完成,处理临床添加外部代理单而供应室未装配时的情况)
 	 * @param sqlBuilder 原来的sql
 	 */
 	private void createUnFinishFilterSql(StringBuilder sqlBuilder){
@@ -296,7 +297,7 @@
 		String returnStatusSql = SqlBuilder.createStatus("returnStatus",InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED, InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
 		//提交状态:committedStatus等于0
         String commitSql = "po.committedStatus = 0 ";
-        sqlBuilder.append(String.format(" AND (%s or %s or %s or %s) ",deliverStatusSql,recyclingStatusSql,returnStatusSql,commitSql));
+        sqlBuilder.append(String.format(" AND (%s or %s or %s or %s or %s) ",deliverStatusSql , "deliverStatus is null",recyclingStatusSql,returnStatusSql,commitSql));
 	}