Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r33211 -r33212
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33211)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33212)
@@ -172,7 +172,7 @@
 			//重新获取代理灭菌单的接收状态
 			setProxyDisinfectionReceiveStatus(proxyDisinfection, tousseInstanceList);
 			//重新获取代理灭菌单的发货状态
-			invoicePlanManager.computeAndSetInvoiceStatus(proxyDisinfection);
+			setProxyDisinfectionDeliverStatus(proxyDisinfection, tousseInstanceList);
 			//计算代理灭菌单物品tousseItem已接收数量GDSZYY-131
 			setProxyDisinfectionReceiveAmount(proxyDisinfection, tousseInstanceList);
 			proxyDisinfection.setTotalAmountOfTousses(tousseInstanceList.size());
@@ -189,6 +189,31 @@
 	}
 
 	/**
+	 * 重新获取代理灭菌单的发货状态
+	 * @param proxyDisinfection
+	 * @param tousseInstanceList
+	 */
+	private void setProxyDisinfectionDeliverStatus(ProxyDisinfection proxyDisinfection,
+			Set<TousseInstance> tousseInstanceList) {
+		int awaitDeliverTousseAmount = 0;
+		if(tousseInstanceList != null){
+			for (TousseInstance ti : tousseInstanceList) {
+				if(!ti.isShipped()){
+					awaitDeliverTousseAmount++;
+				}
+			}
+			if(0 == awaitDeliverTousseAmount){
+				proxyDisinfection.setDeliverStatus(ProxyDisinfection.DELIVERSTATUS_DELIVERED);
+			}else if(tousseInstanceList.size() > awaitDeliverTousseAmount){
+				proxyDisinfection.setDeliverStatus(ProxyDisinfection.DELIVERSTATUS_PARTDELIVERED);
+			}else{
+				proxyDisinfection.setDeliverStatus(ProxyDisinfection.DELIVERSTATUS_AWAITDELIVER);
+			}
+		}
+	}
+	
+
+	/**
 	 * 计算代理灭菌单上物品tousseItem的接收数量
 	 * @param proxyDisinfection
 	 * @param tousseInstanceList
@@ -240,7 +265,6 @@
 		}
 	}
 	
-
 	/**
 	 * 获取代理灭菌单关联的器械包实例,包括已入筐的器械包和未入筐的器械包.
 	 * @param proxyDisinfection 代理灭菌单