Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java
===================================================================
diff -u -r37796 -r37797
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java	(.../OperationReservationTableManager.java)	(revision 37796)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java	(.../OperationReservationTableManager.java)	(revision 37797)
@@ -194,8 +194,8 @@
 		
 		//已终止
 		if(StringUtils.contains(takeOutStatus, TAKE_OUT_STATUS_END)){
-			//存在“待取出”的物品并且不存在“已取出”的物品并且申请单已经终止
-			String tempSql = String.format(" ( exists %s and not exists %s and po.endStatus = '%s') ", inSql, outSql, InvoicePlan.STATUS_END);
+			//不存在“已取出”的物品并且申请单已经终止
+			String tempSql = String.format(" (not exists %s and po.endStatus = '%s') ", outSql, InvoicePlan.STATUS_END);
 			storageStatusSql.add(tempSql);
 		}
 		
@@ -222,8 +222,8 @@
 		
 		//空白
 		if(StringUtils.contains(takeOutStatus, TAKE_OUT_STATUS_BLANK)){
-			//物品没有入库记录
-			String tempSql = String.format(" ( not exists %s and not exists %s ) ", inSql, outSql);
+			//物品没有入库记录,且申请单未终止
+			String tempSql = String.format(" ( not exists %s and not exists %s and (po.endStatus is null or po.endStatus <> '%s') ) ", inSql, outSql, InvoicePlan.STATUS_END);
 			storageStatusSql.add(tempSql);
 		}