Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25479 -r25503
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25479)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25503)
@@ -2260,6 +2260,7 @@
 	var isThereIdentificationCard = toussItem.isThereIdentificationCard;
 	var tousseDefinitionID = toussItem.tousseDefinitionID;
 	var urgentAmount = toussItem.urgentAmount;
+	var spelling = toussItem.spelling;
 	var tousseRemark = isUndefinedOrNullOrEmpty(toussItem.tousseRemark)?'':toussItem.tousseRemark;
 	var urgentLevel = toussItem.urgentLevel?toussItem.urgentLevel:"";
 	var errorDamageQmKey = toussItem.errorDamageQmKey?toussItem.errorDamageQmKey:"";
@@ -2335,7 +2336,8 @@
                    '<input type="hidden" id="hiddenDamageRemark'+row+'" name="hiddenDamageRemark'+row+'" value="'+damageRemark+'"/>'+
                    '<input type="hidden" id="hiddenErrorDamageQmKey'+row+'" name="hiddenErrorDamageQmKey'+row+'" value="'+errorDamageQmKey+'"/>'+
                    '<input type="hidden" id="tousseOrIDCardInstanceBarcodes'+row+'" name="tousseOrIDCardInstanceBarcodes'+row+'" value="'+barcode+'"/>'+
-                   '<div class="tousseDetailTable"><table id="tousseDetailTable'+row+'" border="0" cellpadding="0" cellspacing="0"><tr><td>' + 
+                   '<input type="hidden" id="spelling'+row+'" name="spelling'+row+'" value="'+spelling+'"/>'+
+                   '<div class="tousseDetailTable"><table id="tousseDetailTable'+row+'" border="0" cellpadding="0" cellspacing="0"><tr><td>' +
                    urgentAmountElement + '</td><td>' +
                    '<input id="showTousseName'+row+'" name="showTousseName'+row+'" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" onclick="amendDisinfectionTousse('+row+');" value="'+showTousseName+'"/></td>'+
                    '<td><input id="applicationAmount'+row+'" name="applicationAmount'+row+'" type="text" onclick="setTousseRemark(' + row + ')" readonly="readonly" class="input-b" value="'+applicationAmount+'"/></td>'+
@@ -2676,7 +2678,16 @@
     	alertDiv("不能保存空的回收单！");
     	return false;
     }
-    
+    if(IsentireJudge == false){
+        tousseItemTableChildren();
+        entireGoods = UniquePay(entireGoods);
+    	for(var i=0;i<entireGoods.length;i++){
+    		if(entireGoods[i].loadedAmount ==0){
+                alertDiv("还有部分器械包未装入容器，不能保存");
+                return false;
+			}
+		}
+	}
     //验证清点人是否为空(前提为配置清点人强制不能为空,默认为允许为空)
     if(sstsConfig.recyclePageOperatorNotNull == true && $("#operator").val() == ''){
     	alertDiv('清点人不能为空,请扫描清点人条码。');
@@ -3685,12 +3696,13 @@
                    						isApplyEntireTousse: dataArray[i].isApplyEntireTousse,
                    						urgentAmount : 0,
                    						tousseRemark : '',
-                   						errorDamageQmKey : errorDamageQmKey
+                   						errorDamageQmKey : errorDamageQmKey,
+                                    	spelling : dataArray[i].spelling
                    				};
                    				addToussItem(toussItem,false);
                     		}
                     	}
-                        openDepart(departCode,departName)
+                        openDepart(departCode,departName);
                     }
             	});
     		}
@@ -3706,6 +3718,132 @@
         document.getElementById('departCode').value = departCode;
     }
 }
+
+//按字母过滤
+var isEntire = true;
+var entireGoods =[];//存列表中所有的值
+var IsentireJudge =true
+function entireItme(entireGoods,rows,boxkey,boxkeyGood){
+    var patt1=new RegExp(boxkey,'gi');
+    for(var k = 0; k< entireGoods.length; k++){
+        var spelling = entireGoods[k].spelling;
+		if(patt1.test(spelling)){
+            var toussItem = {
+                row: rows++,
+                tousseItemId: '',
+                tousseName:entireGoods[k].tousseName,
+                tousseDefinitionID:entireGoods[k].tousseDefinitionID,
+                applicationAmount: entireGoods[k].applicationAmount,
+                recycleAmount: entireGoods[k].recycleAmount,
+                loadedAmount: entireGoods[k].loadedAmount,
+                isCleanedEntirely: entireGoods[k].isCleanedEntirely,
+                tousseType: entireGoods[k].tousseType,
+                isThereIdentificationCard: entireGoods[k].isThereIdentificationCard,
+                isApplyEntireTousse: entireGoods[k].isApplyEntireTousse,
+                urgentAmount : 0,
+                tousseRemark : '',
+                errorDamageQmKey : entireGoods[k].errorDamageQmKey,
+                spelling :entireGoods[k].spelling
+            };
+            boxkeyGood.push(toussItem);
+            IsentireJudge =false
+        }
+        if(boxkey == '全部'){
+            for(var k = 0; k< entireGoods.length; k++){
+                var toussItem = {
+                    row: rows++,
+                    tousseItemId: '',
+                    tousseName:entireGoods[k].tousseName,
+                    tousseDefinitionID:entireGoods[k].tousseDefinitionID,
+                    applicationAmount: entireGoods[k].applicationAmount,
+                    recycleAmount: entireGoods[k].recycleAmount,
+                    loadedAmount: entireGoods[k].loadedAmount,
+                    isCleanedEntirely: entireGoods[k].isCleanedEntirely,
+                    tousseType: entireGoods[k].tousseType,
+                    isThereIdentificationCard: entireGoods[k].isThereIdentificationCard,
+                    isApplyEntireTousse: entireGoods[k].isApplyEntireTousse,
+                    urgentAmount : entireGoods[k].urgentAmount,
+                    tousseRemark : '',
+                    errorDamageQmKey : entireGoods[k].errorDamageQmKey,
+                    spelling :entireGoods[k].spelling
+                };
+                boxkeyGood.push(toussItem)
+                IsentireJudge =true;
+            }
+        }
+    }
+}
+function tousseItemTableChildren(){
+    $('#tousseItemTable').children().first().children().each(function(i,element) {
+        var spelling = $('#spelling' + i).val();
+        var tousseName =$('#tousseName' + i).val()
+        var entireItme = {
+            row: i,
+            tousseItemId: '',
+            tousseName: $('#tousseName' + i).val(),
+            tousseDefinitionID: $('#tousseDefinitionID' + i).val(),
+            applicationAmount: $('#applicationAmount' + i).val(),
+            recycleAmount: $('#recycleAmount' +i).val(),
+            loadedAmount: $('#loadedAmount' +i).val(),
+            isCleanedEntirely: $('#isCleanedEntirely' + i).val(),
+            tousseType: $('#tousseType' + i).val(),
+            isThereIdentificationCard: $('#isThereIdentificationCard' + i).val(),
+            isApplyEntireTousse: $('#isApplyEntireTousse' + i).val(),
+            urgentAmount: $('#urgentAmount' + i).val(),
+            tousseRemark: '',
+            spelling: $('#spelling' + i).val()
+        };
+        entireGoods.push(entireItme);
+    })
+}
+function UniquePay(entireGoods){
+    var payArr = [entireGoods[0]];
+    for(var i = 1; i < entireGoods.length; i++){
+        var payItem = entireGoods[i];
+        var repeat = false;
+        for (var j = 0; j < payArr.length; j++) {
+            if (payItem.tousseName == payArr[j].tousseName) {
+                payArr[j].tousseName = payItem.tousseName;
+                payArr[j].loadedAmount = payItem.loadedAmount;
+                repeat = true;
+                break;
+            }
+        }
+        if (!repeat) {
+            payArr.push(payItem);
+        }
+    }
+    return payArr;
+}
+
+function btnBoxKey(boxkey){
+    var boxkeyGood =[];//存当前检索的值
+    var rows = 0;
+    var tousseItemTableLength=$("#tousseItemTable > tbody > tr").length
+    if(tousseItemTableLength<=0){
+        alertDiv('当前没有器械包可查找');
+        return false;
+	}else{
+        if(isEntire == true){
+            tousseItemTableChildren();
+            entireItme(entireGoods,rows,boxkey,boxkeyGood)
+            isEntire =false;
+        }else{
+            tousseItemTableChildren();
+            entireGoods = UniquePay(entireGoods);
+            entireItme(entireGoods,rows,boxkey,boxkeyGood)
+        }
+        if(boxkeyGood.length > 0){
+            $('#tousseItemTable').empty();
+            for(var i=0;i<boxkeyGood.length;i++){
+                addToussItem(boxkeyGood[i],false);
+            }
+        }else{
+            alertDiv('没有匹配到更多数据');
+        }
+	}
+}
+
 /**
  * 可以终止的TousseItem的id.已经回收但是还没有发货的话，也是可以终止的。
  * 目前部分发货不能终止
@@ -3788,7 +3926,8 @@
                						damageRemark : item.damageRemark,
                						urgentLevel : item.urgentLevel,
                						tousseRemark : '',
-               						errorDamageQmKey : errorDamageQmKey
+               						errorDamageQmKey : errorDamageQmKey,
+                                	spelling : item.spelling
                				};
                				addToussItem(toussItem,false);
                				canTerminateTousseItemIds.push(item.id);
@@ -4043,7 +4182,8 @@
       						damageRemark : tousseItem.damageRemark,
       						urgentLevel : tousseItem.urgentLevel,
       						tousseRemark : tousseItem.remark,
-      						errorDamageQmKey : errorDamageQmKey
+      						errorDamageQmKey : errorDamageQmKey,
+                       		spelling:tousseItem.spelling
       				};
                    var successAdd = addToussItem(toussItem,false);
                    if(!successAdd){
@@ -4155,7 +4295,8 @@
                 						urgentAmount : applicationitems[i].urgentAmount,
                 						urgentLevel : applicationitems[i].urgentLevel,
                 						tousseRemark : '',
-                						errorDamageQmKey : errorDamageQmKey
+                						errorDamageQmKey : errorDamageQmKey,
+                                 		spelling:applicationitems[i].spelling
                 				};
             				 addToussItem(toussItem,false);
             				 canTerminateTousseItemIds.push(applicationitems[i].id);
@@ -4285,7 +4426,7 @@
 				var tousses = [];
 				for(var i=0;i<tousseArray.length;++i){
 					var tousseName = tousseArray[i].tousseName;
-					var row = i+'';
+					// var row = i+'';
 					var tousseDefinitionId = tousseArray[i].tousseDefinitionId;
 					var tousse = {
 						tousseName : tousseName,
@@ -4339,4 +4480,4 @@
 //		refreshSplitBasketView();
 //		refreshAllBasketTotalNum();
 	}
-}
\ No newline at end of file
+}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r25451 -r25503
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 25451)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 25503)
@@ -287,6 +287,37 @@
     <!--表单 start-->
     <div class="data-table">
         <div class="box" id="tousseItemBox">
+            <div id="btnBoxGoods" class="btn_box">
+                <span class="btnBoxGoods"><a onclick = "btnBoxKey('全部')">全部</a></span>
+                <ul id= "btnBoxGoods_ul">
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('A')">A</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('B')">B</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('C')">C</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('D')">D</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('E')">E</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('F')">F</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('G')">G</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('H')">H</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('I')">I</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('J')">J</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('K')">K</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('L')">L</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('M')">M</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('N')">N</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('O')">O</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('P')">P</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('Q')">Q</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('R')">R</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('S')">S</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('T')">T</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('U')">U</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('V')">V</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('W')">W</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('H')">H</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('Y')">Y</a> </li>
+                    <li class="btnBoxGoods_li"> <a class="btnBocKey" onclick = "btnBoxKey('Z')">Z</a> </li>
+                </ul>
+            </div>
             <table id="tousseItemTable" border="0" align="center" cellpadding="0" cellspacing="0">
             </table>
         </div>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r23977 -r25503
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 23977)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 25503)
@@ -33,7 +33,7 @@
 		  }
 	}
   
-   function addToussItem(tousseDefinitionId,tousseName,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard){
+   function addToussItem(tousseDefinitionId,tousseName,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard,spelling){
 	   var row = window.parent.document.getElementById("tousseItemTable").rows.length;
 	   var timeStr = new Date().getTime();
 	   var errorDamageQmKey = tousseDefinitionId + "_" + timeStr;
@@ -50,7 +50,8 @@
 			isThereIdentificationCard: isThereIdentificationCard,
 			isApplyEntireTousse: isApplyEntireTousse,
 			urgentAmount:0,
-			errorDamageQmKey:errorDamageQmKey
+			errorDamageQmKey:errorDamageQmKey,
+			spelling:spelling
        };
 	   if(window.parent.addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){
 		   window.parent.highlightExistTousseItem(row);
@@ -86,7 +87,8 @@
 					htmlResultCode += "<li><a href='#' onclick=\"addToussItem('"+tousseArray[i].tousseDefinitionId+"','"
 							+tousseArray[i].tousseName+"','"
 							+tousseArray[i].isApplyEntireTousse+"','"+tousseArray[i].isCleanedEntirely+"','"
-							+tousseArray[i].tousseType+"','"+tousseArray[i].isThereIdentificationCard+"');\">" 
+							+tousseArray[i].tousseType+"','"+tousseArray[i].isThereIdentificationCard+""
+							+tousseArray[i].spelling+"','"+tousseArray[i].spelling+"');\">"
 							+ tousseArray[i].tousseName + "</a></li>";
 				}
 				if(tousseArray.length < countOfLI){
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r25415 -r25503
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 25415)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 25503)
@@ -53,7 +53,7 @@
 
 .data-table{position:absolute; width:1160px; height:500px; bottom:150px; left:33px}
 .data-table .box{ height:500px; overflow-y:scroll; overflow-x:hidden;}
-.data-table .box table{ margin:0 auto; width:1083px}
+.data-table .box table{ margin:0 auto; width:1045px}
 .data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
 .data-table .input-a-yellow{ background:url(pic_bg.jpg) no-repeat 0 -1030px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
 .data-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:40px;}
@@ -382,3 +382,45 @@
 .serialNum-table .btn-box .btn-f:hover{ background:url(btn_exit1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
 .serialNum-table .btn-box .btn-g{ background:url(btn_stop.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; }
 .serialNum-table .btn-box .btn-g:hover{ background:url(btn_stop1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+/*过滤按钮*/
+.btn_box{
+	display: inline-block;
+	width: 60px;
+	float: left;
+	margin-left:5px;
+}
+.btn_box a{
+	line-height: 20px;
+	font-size: 18px;
+	text-decoration: none;
+	cursor: pointer;
+	color:#2e6271;
+	font-weight: bold;
+}
+
+.btn_box a:hover{
+	text-decoration: underline;
+	color:red;
+}
+.btnBoxGoods{
+	display: inline-block;
+	width: 60px;
+	line-height:40px;
+	text-align: center;
+	padding: 5px 0;
+}
+.btnBoxGoods a{
+	color:#2e6271;
+}
+#btnBoxGoods_ul{
+	display: inline-block;
+	width: 60px;
+	text-align: center;
+	margin-top:10px;
+}
+.btnBoxGoods_li{
+	width: 30px;
+	float: left;
+	line-height: 30px;
+	height:30px;
+}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r25444 -r25503
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 25444)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 25503)
@@ -515,7 +515,7 @@
 }
 $(document).ready(function() {
 	/*Annie 快速入框权限*/
-	if(sstsConfig.isIntoTheBox){
+	if(sstsConfig.enableExpressIntoContainer){
 		$('#IntheBox').show();
 	}
 	if(sstsConfig.showRememberRecycleUserButton == true){