Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r20370 -r20374
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 20370)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 20374)
@@ -191,7 +191,28 @@
     	}
     }
 }
-
+//扫描器械包条码和标识牌，添加丢失报损备注到已经存在的回收项
+function addErrorDamageRemark(ti,row){
+	var er = $('#hiddenErrorRemark' + row).val();
+	var dr = $('#hiddenDamageRemark' + row).val();
+	var erArr = [];
+	var drArr = [];
+	if(!isUndefinedOrNullOrEmpty(er)){
+		erArr.push(er);
+	}
+	if(!isUndefinedOrNullOrEmpty(ti.errorRemark)){
+		erArr.push(ti.errorRemark);
+	}
+	
+	if(!isUndefinedOrNullOrEmpty(dr)){
+		drArr.push(dr);
+	}
+	if(!isUndefinedOrNullOrEmpty(ti.damageRemark)){
+		drArr.push(ti.damageRemark);
+	}
+    $('#hiddenErrorRemark' + row).val(erArr.join(';'));
+    $('#hiddenDamageRemark' + row).val(drArr.join(';'));
+}
 function loadUnSupplementMaterial(msg,tmpRow,tousseBarcode){
 	if(msg.unSupplementMaterials != null){
 
@@ -931,6 +952,7 @@
                 		$('#tousseItemTable').children().first().children().each(function(i,element){
                 	         if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
                 	        	 $('#recycleAmount'+i).val(parseInt($('#recycleAmount'+i).val()) + 1);
+                	        	 addErrorDamageRemark(ti,i);
                 	        	 loadUnSupplementMaterial(msg,i,ti.barcode);
                 	             isExist = true;
                 	         }
@@ -1014,6 +1036,7 @@
                             	        	 if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){
                             	        		 $('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val()));
                             	        	 }
+                            	        	 addErrorDamageRemark(ti,i);
                             	        	 loadUnSupplementMaterial(msg,i,ti.barcode);
                             	         }
                             	     });