Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r14975 -r15042
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14975)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 15042)
@@ -1280,8 +1280,8 @@
 				// 所有应归还的物品，都未归还
 				returnStatus = InvoicePlan.RETURN_STATUS_UNRETURNED;
 				
-			} else if(CollectionUtils.matchesAll(needReturnTousseItemsExcludeTerminated, returnedPred)){
-				// 所有应归还的物品，都已归还
+			} else if(CollectionUtils.matchesAll(needReturnTousseItemsExcludeTerminated, returnedPred) && InvoicePlan.DELIVERSTATUS_DELIVERED.equals(invoicePlan.getDeliverStatus())){
+				// 所有应归还的物品，都已归还且当发货状态为已发货
 				returnStatus = InvoicePlan.RETURN_STATUS_RETURNED;
 				
 			} else {