Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r31036 -r31142
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31036)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31142)
@@ -2541,6 +2541,7 @@
 	var tousseDefinitionID = $('#tousseDefinitionID'+row).val();
 	var tousseType = $('#tousseType'+row).val();
 	var materials = $('#materials'+row).val();
+	var isApplyEntireTousse = $('#isApplyEntireTousse'+row).val();
 	if(tousseType == '消毒物品' || tousseType == '灭菌物品'){
 		var width = 740;
 		var height = 400;
@@ -2566,15 +2567,15 @@
 			offsetLeft = ((clientWidth-width)/2)+'px';
 		}
 
-		var url = 'disinfectionTousseItems.jsp?resolution='+resolution+'&row='+row+'&tousseDefinitionID='+tousseDefinitionID+'&materials='+encodeURIComponent(materials)+'&width='+width+'&height='+height;
+		var url = 'disinfectionTousseItems.jsp?resolution='+resolution+'&row='+row+'&tousseDefinitionID='+tousseDefinitionID+'&materials='+encodeURIComponent(materials)+'&width='+width+'&height='+height+'&isApplyEntireTousse='+encodeURIComponent(isApplyEntireTousse)+'&tousseName='+encodeURIComponent(tousseName);
 		
 		if(isIE(8)){
 			openNewSizeWindow(url,'消毒物品明细',width,height);
 		}else {
 			layerIndex=layer.open({
 				type : 2,
 				title : ['消毒物品明细',true],
-				content : 'disinfectionTousseItems.jsp?resolution='+resolution+'&row='+row+'&tousseDefinitionID='+tousseDefinitionID+'&materials='+encodeURIComponent(materials)+'&width='+width+'&height='+height,
+				content : 'disinfectionTousseItems.jsp?resolution='+resolution+'&row='+row+'&tousseDefinitionID='+tousseDefinitionID+'&materials='+encodeURIComponent(materials)+'&width='+width+'&height='+height+'&isApplyEntireTousse='+encodeURIComponent(isApplyEntireTousse)+'&tousseName='+encodeURIComponent(tousseName),
 				area : [ width + 'px' , height + 'px'],
 				border : [5, 0.3, '#fff', true],
 				closeBtn : [2 , true],
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
===================================================================
diff -u -r31141 -r31142
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 31141)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 31142)
@@ -26,14 +26,24 @@
 var materials = '${param.materials}';
 var boxWidth = '${param.width}';
 var boxHeight = '${param.height}';
+var isApplyEntireTousse = '${param.isApplyEntireTousse}';
+var tousseName = '${param.tousseName}';
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 function add(column){
+    if(isApplyEntireTousse == '是'){
+        layer.alert(tousseName+'只能按包申请，不允许修改材料数量，请填写包数量！');
+        return
+    }
     $('#count'+column).html(parseInt($('#count'+column).html(),10)+1);
     speaker.speak($('#count'+column).html());
 }
 
 function reduce(column){
+    if(isApplyEntireTousse == '是'){
+        layer.alert(tousseName+'只能按包申请，不允许修改材料数量，请填写包数量！');
+        return
+    }
     if(parseInt($('#count'+column).html(),10) > 0){
         $('#count'+column).html(parseInt($('#count'+column).html(),10)-1);
     }
@@ -103,7 +113,7 @@
         sumCount += parseInt($('#count'+i).text());
     });
     if(sumCount == 0){
-        alert('材料数量不允许全部改成0');
+        layer.msg('材料数量不允许全部改成0');
         return
     }
 	if(window.parent){
@@ -202,6 +212,10 @@
 
 var openElement;
 function openUpdateAmount(obj,row){
+    if(isApplyEntireTousse == '是'){
+        layer.alert(tousseName+'只能按包申请，不允许修改材料数量，请填写包数量！');
+        return
+    }
 	obj.blur();
 	var width = 750;
     var height = 400;