Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r14773 -r14790
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 14773)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 14790)
@@ -161,14 +161,15 @@
 		if(foreignProxyDisinfection == null){
 			throw new RuntimeException("申请单已被删除!");
 		}
+		// 如果已装配,不让删
+		if(foreignProxyDisinfection.hasPacked()){
+			throw new RuntimeException("该申请单已装配,不能删除！");
+		}
 		if(!foreignProxyDisinfection.deliverStatusNotSet() && !foreignProxyDisinfection.awaitDeliver() && !foreignProxyDisinfection.deliverEnd()){
 			throw new RuntimeException(String.format("不能删除状态为%s的记录!", foreignProxyDisinfection.getDeliverStatus()));
 		}
-		// 如果不是待装配或者待发货状态,不让删
-		if (!InvoicePlan.DELIVERSTATUS_AWAITDELIVER
-				.equals(foreignProxyDisinfection.getDeliverStatus())) {
-			
-		}
+		
+		
 		// 如果是待发货状态,只要有一个器械包不是已审核状态,不让删
 		// 判断器械包是否已经有已灭菌或已发货的
 		boolean reviewed = checkToussesInForeignProxyItemHasSterileOrDelivered(Long