Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r25710 -r25781
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 25710)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 25781)
@@ -988,10 +988,7 @@
 function openQuickRecyclePage(){
 	location.href = "expressRecycleForTouchScreen.jsp?resolution=${param.resolution}&id="+id;
 }
-/*Annie 快速入框*/
-function modificationImg(){
-	$('#IntheBox').attr('src','./1980/images/speediness_hover.png')
-}
+
 function onmouseoutImg(){
 	$('#IntheBox').attr('src','./1980/images/speediness.png')
 }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
===================================================================
diff -u -r25773 -r25781
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js	(.../expressIntoBasket.js)	(revision 25773)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js	(.../expressIntoBasket.js)	(revision 25781)
@@ -722,27 +722,6 @@
         $('#recycleAmount'+row).val(recycleAmount-1);
     }
 }
-//打开编辑数量页面
-var openElement;
-function openUpdateAmount(obj,row){
-    obj.blur();
-    var width = 550;
-    var height = 300;
-    if(resolution == '1980'){
-        width = 750;
-        height = 400;
-    }
-    openElement = obj;
-    layerIndex = layer.open({
-        type : 2,
-        title : ['修改数量',true],
-        content : 'updateAmount.jsp?resolution='+1980+'&row='+row,
-        area : [width + 'px' , height + 'px'],
-        border : [5, 0.3, '#fff', true],
-        closeBtn : [2 , true],
-        offset : ['250px','']
-    });
-}
 //打开输入装载数量页面
 function openUpdateLoadAmount(obj,row){
     if(!sstsConfig.enableCustomIntoBasketWithCustomAmount){
@@ -821,7 +800,7 @@
         '<td width="300px"><input id="showTousseName'+row+'" name="showTousseName'+row+'" type="text" readonly="readonly" class="input-a"" value="'+materialName+'"/></td>'+
         '<td><input id="applicationAmount'+row+'" name="applicationAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+recycleAmount+'"/></td>'+
         '<td><a href="javascript:void(0);" class="add" onclick="add('+row+');">+</a></td>'+
-        '<td><input id="recycleAmount'+row+'" name="recycleAmount'+row+'" type="text" class="input-b" onclick="openUpdateAmount(this,'+ row +');" value="'+recycleAmount+'"/></td>'+
+        '<td><input id="recycleAmount'+row+'" name="recycleAmount'+row+'" type="text" class="input-b"  value="'+recycleAmount+'"/></td>'+
         '<td><a href="javascript:void(0);" class="minus" onclick="reduce('+row+');">-</a></td>'+
         '<td><input id="loadedAmount'+row+'" name="loadedAmount'+row+'" type="text" readonly="readonly" class="input-b" onclick="openUpdateLoadAmount(this,'+ row +');" value="0"/></td>'+
         '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putMaterialInBasket('+row+',false);refreshBasketStatus();refreshAllBasketTotalNum();">入筐</a></td>'+
@@ -1454,9 +1433,7 @@
                 for(var c = 0;c<recyclingItemArraysMaterials.length;c++){
                     recyclingItemArray.push({
                         tousseName:recyclingItemArraysbox,
-                        // recycleAmount:jSONe.recyclingItemArray[r].recycleAmount,
                         recycleAmount:recyclingItemArraysMaterials[c].amount,
-                        // loadedAmount:jSONe.recyclingItemArray[r].loadedAmount,//Annie
                         loadedAmount:recyclingItemArraysMaterials[c].amount,//Annie
                         tousseDefinitionID:jSONe.recyclingItemArray[r].tousseDefinitionID,
                         tousseRemark:'',
@@ -1746,6 +1723,10 @@
     $('#tousseItemTable').children().first().children().each(function(row,element){
         if($('#deleted'+row).val() == '0'){
             var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
+            if(parseInt($('#recycleAmount'+row).val(),10) > parseInt($('#applicationAmount'+row).val(),10)){
+                alertDiv("回收数量大于申请数量，不能进行入筐操作");
+                return false;
+            }
             if(amount > 0){
                 putMaterialInBasket(row,true);
             }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25778 -r25781
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25778)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25781)
@@ -3125,6 +3125,7 @@
     var isAllTousseInTheBasket = true;
     var urgentAmountError = false;
     var isIdCardItme = true;//是否带有标识牌的器械包没有入框
+	var ForeignInstrument = true;//是否存在外来器械包
 	var isIdCardFalse =true;
 	var tousseNames;
     if($('#depart').val()== ''){
@@ -3161,6 +3162,7 @@
 				* 回收数量小于0
 				* 普通包是否入框
 				* 带有标识牌的包是否没有入框
+				* 外来器械包不能清点确认
 			*/
             var tousseName = $('#tousseName'+index).val();
             var isIdCard =$('#isThereIdentificationCard'+index).val();
@@ -3171,6 +3173,11 @@
                     return false;
                 }
             }
+            if(tousseType == "外来器械包" || tousseType == "null" || tousseType == "undefined"){
+                tousseNames = tousseName;
+                ForeignInstrument = false;
+                return false;
+            }
             if(isIdCard == '否' || isIdCard === 'null' ||isIdCard ==='undefined'){
                     if(loadedAmount > 0){
                         tousseNames = tousseName;
@@ -3187,6 +3194,10 @@
         alertDiv('带有标识牌的 '+tousseNames+' 器械包还没有入框，不能做清点确认');
 		return false;
 	}
+	if(!ForeignInstrument){
+        alertDiv( tousseNames+'属于外来器械包，不能做清点确认');
+        return false;
+	}
     if(!isIdCardFalse){
         alertDiv(tousseNames+' 普通器械包已经入框,不能做清点确认');
         return false;