Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25528 -r25537
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25528)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25537)
@@ -1967,7 +1967,7 @@
 	var loadedAmount = 0;
 	var recyclingApplicationId = $('#recyclingApplicationId').val();
     DWREngine.setAsync(false);
-    RecyclingRecordTableManager.getTousseIntoBasketAmount(tousseDefinitionID,recycleAmount,idCardBarcode,JSON.stringify(params),JSON.stringify(getTousseIntoBasketInfo()),recyclingApplicationId,function(result){
+    RecyclingRecordTableManager.getTousseIntoBasketAmount(boxkeyGood,recycleAmount,idCardBarcode,JSON.stringify(params),JSON.stringify(getTousseIntoBasketInfo()),recyclingApplicationId,function(result){
     	var jsonObj = JSON.parse(result);
     	
     	if(!jsonObj.success){
@@ -3753,7 +3753,7 @@
     var patt1=new RegExp(boxkey,'gi');
     for(var k = 0; k< entireGoods.length; k++){
         var spelling = entireGoods[k].spelling;
-		if(patt1.test(spelling)){
+		if(patt1.test(spelling) || !spelling.indexOf(boxkey)){
             var toussItem = {
                 row: rows++,
                 tousseItemId: '',
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r25512 -r25537
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 25512)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 25537)
@@ -313,7 +313,7 @@
                     <li onclick = "btnBoxKey('U')" class="btnBoxGoods_li"> <a class="btnBocKey" >U</a> </li>
                     <li onclick = "btnBoxKey('V')" class="btnBoxGoods_li"> <a class="btnBocKey" >V</a> </li>
                     <li onclick = "btnBoxKey('W')" class="btnBoxGoods_li"> <a class="btnBocKey" >W</a> </li>
-                    <li onclick = "btnBoxKey('H')" class="btnBoxGoods_li"> <a class="btnBocKey" >H</a> </li>
+                    <li onclick = "btnBoxKey('X')" class="btnBoxGoods_li"> <a class="btnBocKey" >X</a> </li>
                     <li onclick = "btnBoxKey('Y')" class="btnBoxGoods_li"> <a class="btnBocKey" >Y</a> </li>
                     <li onclick = "btnBoxKey('Z')" class="btnBoxGoods_li"> <a class="btnBocKey" >Z</a> </li>
                 </ul>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r25519 -r25537
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 25519)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 25537)
@@ -419,7 +419,7 @@
 	display: inline-block;
 	width: 70px;
 	text-align: center;
-	margin-top:10px;
+	margin-top:5px;
 }
 .btnBoxGoods_li{
 	width: 35px;