Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r30841 -r30843
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30841)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30843)
@@ -4493,6 +4493,7 @@
 		var isPartIntheBasket = false;
 		var tousseTypeisForeignTousseDefinition = false;
 		var tousseTypeName = '';
+		var recyclingStatus = $("#recyclingStatus").val();
 		$('#tousseItemTable').children().first().children().each(function(index,element){
 	        if($('#deleted'+index).val() == '0'){
 	        	var tousseName = $('#tousseName'+index).val();
@@ -4525,7 +4526,7 @@
 						checkAutoReturnBorrowing(confirmation,saveAndNew,print,recyclingAmountConfirm);
 					}
 				});
-			}else if(tousseTypeisForeignTousseDefinition == true){
+			}else if(tousseTypeisForeignTousseDefinition == true && recyclingStatus == '部分回收'){
 				dialogConfirm("还有部分器械包未装入篮筐，是否继续保存？",function(){
 					if(sstsConfig.showRecyclingDetail && recyclingTousses.length > 0){
 						showRecyclingDetail(recyclingTousses,function(){
@@ -5889,10 +5890,11 @@
 	document.onkeydown = showKeyDown;
     var recyclingApplicationId = params_appId;
     var barcode = params_barcode;
-    var recyclingStatus = null;
+	var recyclingStatus = null;
     if(!isUndefinedOrNullOrEmpty(recyclingApplicationId)){
         DWREngine.setAsync(false);
         RecyclingApplicationTableManager.getRecyclingApplicationForRecycle(recyclingApplicationId,function(application){
+			console.log(application)
 			if(application == null)
             	return;
             recyclingStatus = application.recyclingStatus;
@@ -5901,7 +5903,8 @@
 			}
            	if(application.recyclingRecordId != null && application.type !== TYPE_FOREIGNTOUSSEAPPLIACTION){
 				loadRecyclingRecordById(application.recyclingRecordId);
-				findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes)
+				findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes);
+				$("#recyclingStatus").val(application.recyclingStatus);
 				//如果回收数量为0不显示
 				if(sstsConfig.hideZeroPrerecycleAmountTousseItem && application.isPrepareRecycled === 1){
 					//配置为预回收为0的物品不显示，相当于删除，但是需要是没有丢失报损的
@@ -5919,7 +5922,8 @@
 				}
            	}else if(application.recyclingRecordId != null && application.type == TYPE_FOREIGNTOUSSEAPPLIACTION && application.recyclingStatus == "部分接收"){
 				loadRecyclingRecordById(application.recyclingRecordId);
-				findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes)
+				findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes);
+				$("#recyclingStatus").val(application.recyclingStatus);
 				//如果回收数量为0不显示
 				if(sstsConfig.hideZeroPrerecycleAmountTousseItem && application.isPrepareRecycled === 1){
 					//配置为预回收为0的物品不显示，相当于删除，但是需要是没有丢失报损的