Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r19889 -r19924
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 19889)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 19924)
@@ -3106,7 +3106,7 @@
                    if(recyclingApplication != null && recyclingApplication.applicationItems != null){
                 	   var applyItems = recyclingApplication.applicationItems;
                 	   for(var n = 0;n < applyItems.length;n++){
-                		   if(applyItems[n].tousseName == tousseItem.tousseName){
+                		   if(applyItems[n].tousseDefinitionId == tousseItem.tousseDefinitionId){
                 			   applyAmount = applyItems[n].amount;
                 			   break;
                 		   }
@@ -3210,17 +3210,17 @@
             
             if(applicationitems != null){
             	for(var i = 0; i < applicationitems.length;i++){
-            		var tousseName = applicationitems[i].tousseName;
+            		var tousseDefinitionId = applicationitems[i].tousseDefinitionId;
             		var recycled = false;
             		 if(record.items != null){
                          for(var j = 0 ; j< record.items.length ; j++){
-                        	 var tousseName2 = record.items[j].tousseName;
-                        	 if(tousseName == tousseName2){
+                        	 var tousseDefinitionId2 = record.items[j].tousseDefinitionId;
+                        	 if(tousseDefinitionId == tousseDefinitionId2){
                         		 recycled = true;
                         	 }
                          }
             		 }
-            		 if(!recycled && recyclingStatus != "已回收"){
+            		 if(!recycled && recyclingStatus != "已回收" && recyclingStatus != '已接收'){
             			 if(applicationitems[i].diposable == '否' && applicationitems[i].tousseType != '敷料包' && applicationitems[i].tousseType != '自制物品'){
             				var errorDamageQmKey = applicationitems[i].errorDamageQmKey;
                				if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){