Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14739 -r14791
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14739)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14791)
@@ -71,6 +71,7 @@
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord;
+import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.exception.RecyclingRecordException;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
@@ -406,6 +407,12 @@
 				canDelete = false;
 			}
 		}
+		if (invoicePlan instanceof ForeignProxyDisinfection) {
+			ForeignProxyDisinfection foreignProxyDisinfection = (ForeignProxyDisinfection)invoicePlan;
+			if(foreignProxyDisinfection.hasPacked()){
+				throw new RuntimeException("该申请单已装配,不能删除！");
+			}
+		}
 		if (canDelete) {
 			if (invoicePlan instanceof RecyclingApplication) {
 				deleteRecyclingApplication((RecyclingApplication) invoicePlan);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r14722 -r14791
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 14722)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 14791)
@@ -1207,11 +1207,14 @@
 					}
 				} catch (Exception e) {
 					e.printStackTrace();
+					message = e.getMessage();
 				}
 			}
 		}
 		if (deleteSucceeded == 0) {
-			message = "删除失败。";
+			if(StringUtils.isBlank(message)){
+				message = "删除失败!";
+			}
 		} else {
 			message = deleteSucceeded + "条申请单删除成功。";
 		}
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r14790 -r14791
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 14790)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 14791)
@@ -162,9 +162,9 @@
 			throw new RuntimeException("申请单已被删除!");
 		}
 		// 如果已装配,不让删
-		if(foreignProxyDisinfection.hasPacked()){
-			throw new RuntimeException("该申请单已装配,不能删除！");
-		}
+//		if(foreignProxyDisinfection.hasPacked()){
+//			throw new RuntimeException("该申请单已装配,不能删除！");
+//		}
 		if(!foreignProxyDisinfection.deliverStatusNotSet() && !foreignProxyDisinfection.awaitDeliver() && !foreignProxyDisinfection.deliverEnd()){
 			throw new RuntimeException(String.format("不能删除状态为%s的记录!", foreignProxyDisinfection.getDeliverStatus()));
 		}