Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
===================================================================
diff -u -r15421 -r16473
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 15421)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 16473)
@@ -132,27 +132,31 @@
 			width : 100,
 			dataIndex : 'specification'
 		}, {
-			header : "清洗分类类型",
-			width : 100,
-			dataIndex : 'washClassifyType'
-		}, {
-            header : "已上传图片",
-            width : 70,
-            dataIndex : 'isUploadImage',
-            renderer : unUploadImage
-        }, {
-			header : "类型",
-			width : 130,
-			dataIndex : 'type'
-		}, {
 			header : "单位",
 			width : 35,
 			dataIndex : 'unit'
+		}, {
+			header : "清洗分类类型",
+			width : 100,
+			dataIndex : 'washClassifyType'
 		},{
 			header : "库存数量",
 			width : 60,
 			dataIndex : 'storage'
 		},{
+			header : "清洗装载上限数量",
+			width : 110,
+			dataIndex : 'intoBasketMaxAmount'
+		}, {
+			header : "类型",
+			width : 60,
+			dataIndex : 'type'
+		}, {
+            header : "已上传图片",
+            width : 70,
+            dataIndex : 'isUploadImage',
+            renderer : unUploadImage
+        },{
 			header : "单一器械跟踪",
 			width : 80,
 			dataIndex : 'isTraceble'
@@ -288,6 +292,8 @@
 		    name : 'isForeignMaterial'
 		},{
 			name : 'isImplant'
+		},{
+			name : 'intoBasketMaxAmount'
 		}];
 
 		var sign = true;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r16469 -r16473
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 16469)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 16473)
@@ -1480,8 +1480,12 @@
         	 reduceButton = '<td><a href="javascript:void(0);" class="minus" onclick="reduce('+row+');">-</a></td>';
         	 onclickFun = 'onclick="openUpdateAmount(this,'+ row +');"';
          }else{
-        	 addButton = '<td><a href="javascript:void(0);" class="add" onclick="">+</a></td>';
-        	 reduceButton = '<td><a href="javascript:void(0);" class="minus" onclick="">-</a></td>';
+        	 var alertText = "该包为非整包申请器械包，请点击器械包名修改材料数量!";
+        	 if(tousseType == '外来器械包'){
+        		 alertText = "外来器械包不允许修改回收数量，请点击器械包名修改材料数量!"; 
+        	 }
+        	 addButton = '<td><a href="javascript:void(0);" class="add" onclick="alertDiv(\'' + alertText + '\');">+</a></td>';
+        	 reduceButton = '<td><a href="javascript:void(0);" class="minus" onclick="alertDiv(\'' + alertText + '\');">-</a></td>';
         	 onclickFun = '';
          }
          var urgentAmountElement = "";