Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r26282 -r26369
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26282)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26369)
@@ -1490,7 +1490,6 @@
 }
 
 function openSetUrgentAmountPage(row){
-	
 	var tousseItemId = $('#tousseItemId'+row).val();
 	if(tousseItemId != ''){
 		return false;
@@ -1706,7 +1705,7 @@
 	$('#urgentLevel' + row).val(urgentLevel);
 	if(urgentAmount > 0){
 		$('#urgentAmountDiv'+row).css("background-image","url(urgentBg.png)");
-		if(sstsConfig.showUrgentLevel){
+		if(sstsConfig.enableUrgentFunction){
 			$('#urgentAmountDiv'+row).html(urgentLevel);
 		}else{
 			$('#urgentAmountDiv'+row).html(urgentAmount);
@@ -2391,7 +2390,7 @@
          if(!isUndefinedOrNull(urgentAmount) && urgentAmount > 0){
         	 var msg = urgentAmount;
         	 var fontSize="30px";
-        	 if(sstsConfig.showUrgentLevel){
+        	 if(sstsConfig.enableUrgentFunction){
         		 msg = urgentLevel;
         		 fontSize = "16px";
         	 }
@@ -2404,7 +2403,7 @@
         		 msg = "";
         	 }
         	 var fontSize="30px";//如果要显示加急等级,字体就要小
-        	 if(sstsConfig.showUrgentLevel){
+        	 if(sstsConfig.enableUrgentFunction){
         		 fontSize = "16px";
         	 }
         	 urgentAmountElement = '<div id="urgentAmountDiv'+row+'" class="divStyle" style="' + bgMsg + 'font-size:'+fontSize+';" onclick="openSetUrgentAmountPage('+row+');">'+msg+'</div>';
@@ -2647,12 +2646,14 @@
             var originalUrgentAmount = parseInt($('#originalUrgentAmount'+index).val(),10);
             var urgentAmount = parseInt($('#urgentAmount'+index).val(),10);
             var tousseItemId = $('#tousseItemId'+index).val();
+			var urgentLevel = $('#urgentLevel'+index).val();
             //已保存的tousseItem（tousseItemId不为空）不能再修改；
             if(tousseItemId == ""){
             	urgentItemJsonArray.push({
               		tousseName:tousseName,
               		tousseDefinitionID:tousseDefinitionID,
-              		urgentAmount:urgentAmount
+              		urgentAmount:urgentAmount,
+					urgentLevel:urgentLevel
               	});
             }
         }
@@ -4734,5 +4735,25 @@
  * @param row 行号
  */
 function createMaterialInfo(dataJson,row){
+	//已入筐物品，要先删除入筐物品才能修改
+	var tousseName = $('#tousseName'+row).val();
+    var isExist = false;
+    $("#basketsUl li").each(function(){
+   		$(this).find('dl').children().each(function(i,element){
+   			if($(this).attr('type') == 'hidden'){
+   				var hideStr = $(this).val();
+       			var json = JSON.parse(hideStr);
+       			if(json.tousseName == tousseName){
+       				isExist = true;
+       			}
+   			}
+   		});
+	});
+    if(isExist){
+    	msg = tousseName+"已入筐，请从篮筐内删除后再修改材料数量！";
+    	alertDiv(msg);
+    	return false;
+    }
 	$("#materials"+row).val(JSON.stringify(dataJson));
+	return true;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
===================================================================
diff -u -r26286 -r26369
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 26286)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 26369)
@@ -71,9 +71,13 @@
     	materialItems.push(materialItem);
     });
     if(window.parent){
-    	window.parent.createMaterialInfo(materialItems,row);
+    	var  falg= window.parent.createMaterialInfo(materialItems,row);
+    	if(falg){
+    		alert('修改成功。');
+    	}else{
+    		alert('修改失败。');
+    	}
     }
-    alert('修改成功。');
 	closeLayer();
 }
 function loadMaterialNotice(materialDefinitionId){