Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25761 -r25777
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25761)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25777)
@@ -1082,8 +1082,7 @@
 function showSelectTousseDiscardCauseWin(){
 	return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400");
 }
-arrayGood = [];//保存已清洗或者已装配
-var quantity = 0;//保存当前已清洗或者已装配的次数
+var arrayGood = [];//保存清洗完成或者清洗中状态篮筐条码信息
 function loadgin(msg,containerStatus,d){
 
     $("#dialogConfirm").dialog({
@@ -1102,10 +1101,12 @@
                 addBasketElement(msg.basket);
                 $( this ).dialog( "close" );
                 loaddialogConfirm(d+1);
+                arrayGood = [];
             },
             "否": function() {
                 $( this ).dialog( "close" );
 				loaddialogConfirm(d+1);
+                arrayGood = [];
             }
         }
     });
@@ -1190,13 +1191,9 @@
                 }else if(msg.basket != null){
                     //不装配的篮筐不能回收扫描
                     var containerStatus = msg.basket.containerStatus;
-                    quantity++;
                     if(containerStatus == "清洗完成" || containerStatus == "清洗中"){
                         arrayGood.push({msg:msg,containerStatus:containerStatus});
-                    	if(quantity == departBindingBasketAmount){
-                            quantity = 0;
-                            loaddialogConfirm(0);
-						}
+                        loaddialogConfirm(0);
                     }else{
                     	addBasketElement(msg.basket);
                     }
@@ -2757,12 +2754,18 @@
         tousseItemTableChildren();
         entireGoods = UniquePay(entireGoods);
         applictionStor(entireGoods);
+        // 未完全入筐的包的名字
+        var notLoadedTousseNames = [];
     	for(var i=0;i<entireGoods.length;i++){
-    		if(entireGoods[i].loadedAmount ==0){
-                alertDiv("还有部分器械包未装入容器，不能保存");
-                return false;
+			if(entireGoods[i].loadedAmount < entireGoods[i].recycleAmount){
+                notLoadedTousseNames.push(entireGoods[i].tousseName);
 			}
 		}
+		if (notLoadedTousseNames.length > 0){
+            alertDiv("有如下器械包未装入容器或被隐藏，不能保存：\r\n" + notLoadedTousseNames.join(","));
+            return false;
+		}
+
 	}
     //验证清点人是否为空(前提为配置清点人强制不能为空,默认为允许为空)
     if(sstsConfig.recyclePageOperatorNotNull == true && $("#operator").val() == ''){