Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
===================================================================
diff -u -r16080 -r16725
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java	(.../QualityMonitoringInstanceAction.java)	(revision 16080)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java	(.../QualityMonitoringInstanceAction.java)	(revision 16725)
@@ -33,6 +33,7 @@
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.json.JSONUtil;
+import com.forgon.tools.string.StringTools;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
 
@@ -80,7 +81,10 @@
 		boolean success = true;
 		String message = "保存成功！";
 		try {
-			qualityMonitoringInstanceManager.saveQualityMonitoringInstance(qualityMonitoringInstance, map);
+			String ret = qualityMonitoringInstanceManager.saveQualityMonitoringInstance(qualityMonitoringInstance, map);
+			if(!StringTools.isBlank(ret)){
+				message = ret;
+			}
 		} catch (Exception e) {
 			success = false;
 			message = e.getMessage().toString();
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16717 -r16725
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16717)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16725)
@@ -4896,7 +4896,10 @@
 		if(tousseInstance == null){
 			return;
 		}
-
+		TousseDefinition td = tousseInstance.getTousseDefinition();
+		if(td == null || td.isForeignOrSplitTousse()){
+			return;
+		}
 		List<TousseInstance> tousseInstanceList = new ArrayList<TousseInstance>();
 		tousseInstanceList.add(tousseInstance);
 		
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r16358 -r16725
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 16358)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 16725)
@@ -550,15 +550,15 @@
 			disableRecycleAndRepacking();
 		}else{
 			enableRecycleAndRepacking();
-		}
-		var toussedefRecycling = top.Ext.getCmp('tousseDefRecycling').getValue();
-		if(!isUndefinedOrNullOrEmpty(toussedefRecycling)){
-			if(tousseType == '敷料包' || toussedefRecycling == '否'){
-				//敷料包或者是不回收的包，不能选择重新回收,只能选重新装配
-				top.Ext.getCmp('recycle').setValue(false);
-				top.Ext.getCmp('recycle').disable();
-			}else{
-				top.Ext.getCmp('recycle').enable();
+			var toussedefRecycling = top.Ext.getCmp('tousseDefRecycling').getValue();
+			if(!isUndefinedOrNullOrEmpty(toussedefRecycling)){
+				if(tousseType == '敷料包' || toussedefRecycling == '否'){
+					//敷料包或者是不回收的包，不能选择重新回收,只能选重新装配
+					top.Ext.getCmp('recycle').setValue(false);
+					top.Ext.getCmp('recycle').disable();
+				}else{
+					top.Ext.getCmp('recycle').enable();
+				}
 			}
 		}
 	}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r16722 -r16725
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 16722)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 16725)
@@ -4401,11 +4401,16 @@
 			return "";
 		}
 		TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(tousseInstanceId);
-		if(tousseInstance == null || tousseInstance.getTousseDefinition().isDressing() 
-				|| !tousseInstance.getTousseDefinition().recycling()){
+		TousseDefinition td = tousseInstance.getTousseDefinition();
+		if(tousseInstance == null || td == null || td.isDressing() 
+				|| !td.recycling()){
 			String msg = "敷料包和不回收的器械包,不生成回收申请单";
 			return msg;
 		}
+		if(td.isForeignOrSplitTousse()){
+			String msg = TousseDefinition.PACKAGE_TYPE_FOREIGN + "和" + TousseDefinition.PACKAGE_TYPE_SPLIT + ",不生成回收申请单";
+			return msg;
+		}
 		//已装配、已审核、已灭菌、灭菌中才能处理
 		if(tousseInstance.isPacked() || tousseInstance.isReviewed() || tousseInstance.isSteriling() 
 				|| tousseInstance.isSteriled() || tousseInstance.isDisinfected()){