Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r30315 -r31565
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 30315)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 31565)
@@ -223,7 +223,21 @@
 				newJsonArray.push(item);
 			}
 		}
-		//newJsonArray = newArray2(newJsonArray);
+		if(isErrorAmountZero && $("#errorRemark").val() != ""){
+			alert("填写了备注,请选择丢失的材料!");
+			return;
+		}
+		var maxAmount = 0;
+		for(var i=0;i<newJsonArray.length;i++){
+			var materialName = newJsonArray[i].materialName;
+			if(materialName == '器械包标识牌'){
+				maxAmount += parseInt(newJsonArray[i].amount);
+			}
+		}
+		if(window.parent.isDeleteErrors(row,tousseDefinitionID,maxAmount)){
+			alert('该物品已入筐，不能直接改小标识牌的丢失数量，请先将物品从篮筐中移除后再进行修改！');
+			return;
+		}
 		if (isErrorExist) {
 			window.parent.document.getElementById('showTousseName' + row).className = 'input-a-yellow';
 			window.parent.document.getElementById('recyclingErrorButton' + row).className = 'btn-b-edit';
@@ -241,10 +255,6 @@
 			}
 			window.parent.document.getElementById('recyclingErrorButton' + row).className = 'btn-b';
 		}
-		if(isErrorAmountZero && $("#errorRemark").val() != ""){
-			alert("填写了备注,请选择丢失的材料!");
-			return;
-		}
 		window.parent.setTousseItemRecyclingError(row,JSON.stringify(newJsonArray),$('#errorRemark').val());
 		closeLayer();
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r31553 -r31565
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31553)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31565)
@@ -2280,6 +2280,32 @@
 	});
 }
 
+//SSTS-394:回收时标识牌登记丢失入筐后，不应允许直接再改小标识牌的丢失数量
+function isDeleteErrors(row,newTousseDefinitionID,maxAmount){
+	var isIDCard = $('#isThereIdentificationCard' + row).val();
+	var isReturn = false;
+	if (isIDCard == '是') {
+		var jsonStr = getJsonParams(false, false);
+		if (jsonStr == '') { return; }
+		var jSONe = JSON.parse(jsonStr);
+		var sumAmount = 0;
+		if(jSONe.tousseJson.length > 0){
+			for(var i=0;i<jSONe.tousseJson.length;i++){
+				var tousseDefinitionID = jSONe.tousseJson[i].tousseDefinitionID;
+				var amount = jSONe.tousseJson[i].amount;
+				if(tousseDefinitionID == newTousseDefinitionID && jSONe.tousseJson[i].idCardBarcode == ''){
+					sumAmount += parseInt(amount);
+				}
+			}
+			if(sumAmount > maxAmount){
+				isReturn = true;
+			}
+		}
+	}
+
+	return isReturn;
+}
+
 // 打开材料报损的窗口
 function openRecyclingDamagePage(row, tousseName, tousseItemId, errorDamageQmKey) {
 	var tousseType = $('#tousseType' + row).val();
@@ -2425,6 +2451,8 @@
 	refreshDamageMaterialsView(row);
 }
 
+
+
 // 将丢失报损的材料json字符串格式化为 名称*数量;名称*数量 的形式.如果数量为0,则排除
 function formatErrorOrDamageMaterials(materialArrayStr) {
 	if (!isUndefinedOrNullOrEmpty(materialArrayStr)) {
@@ -4624,7 +4652,7 @@
 	var jsonStr = getJsonParams(confirmation, isConfirm);
 	if (jsonStr == '') { return; }
 	var jSONe = JSON.parse(jsonStr);
-	//console.log(jSONe);return
+	console.log(jSONe);return
 	alertDiv("保存中,请稍候......", true);
 	if (IntheBoxState == true) {
 		jSONe.tally = true;