Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css
===================================================================
diff -u -r17930 -r19703
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css	(.../customIntoBasketStyle.css)	(revision 17930)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css	(.../customIntoBasketStyle.css)	(revision 19703)
@@ -32,6 +32,8 @@
 .mbody .btn-h{ margin-left: 220px;margin-top: 140px; background:url(allIntoBasket.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;}
 .mbody .btn-h:hover{ margin-left: 220px;margin-top: 140px; background:url(allIntoBaskehovert.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;}
 
+.mbody .splitInfo{ margin-left: 490px;margin-top: 140px;  border:none; font-size:24px;color:red; line-height:32px; display:inline-block}
+
 .add-form{ position:absolute; width:855px; height:151px; top:233px; left:175px}
 .add-form div{ position:absolute;}
 .add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -135px; width:272px; height:42px; border:0px; font-size:26px; padding:10px 10px; line-height:40px;}
@@ -101,11 +103,15 @@
 .zhuangzai-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer}
 .zhuangzai-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer}
 .zhuangzai-table .sed{ display:none}
-.zhuangzai-table .list-item li{ background:url(table_bg.gif) no-repeat top center; padding:8px 0px 7px 0;font-size:18px; color:#666; line-height:58px; }
+.zhuangzai-table .list-item li{ background:url(table_bg_custom.gif) no-repeat top center; padding:8px 0px 7px 0;font-size:18px; color:#666; line-height:58px; }
 .zhuangzai-table .list-item li em{ width:85px; text-align:center;}
 .zhuangzai-table .list-item li i{ width:129px; text-align:center}
-.zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
+.zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:inline-block; line-height:200px; overflow:hidden; margin:0 auto}
 .zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; }
+
+.zhuangzai-table .list-item li .btn-removeImplant{ background:url(pic_bg2.jpg) no-repeat -330px -417px; width:137px; height:58px; display:inline-block; line-height:200px; overflow:hidden; margin:0 auto}
+.zhuangzai-table .list-item li .btn-removeImplant:hover{ background-position: -330px -475px; }
+
 .zhuangzai-table .list-item dl{ margin-top:7px; width:625px; background:#f9fce8; }
 .zhuangzai-table .list-item dd{ float:left;  border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; }
 .zhuangzai-table .list-item .name{ width:397px;}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
===================================================================
diff -u -r18645 -r19703
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java	(.../BeCleanItemManager.java)	(revision 18645)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java	(.../BeCleanItemManager.java)	(revision 19703)
@@ -64,8 +64,6 @@
 	public void addMaterialToWashBasket(ClassifyBasket classifyBasket, Long materialDefinitionId, String name, int amount);
 	
 	public List<BeCleanItem> findBeCleanByType(String itemType);
-
-	public void deleteClassifiedItem(ClassifiedItem classifiedItem);
 	
 	public void deleteRemovedClassifiedItem();
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
===================================================================
diff -u -r18645 -r19703
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 18645)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 19703)
@@ -55,7 +55,13 @@
 	private CleanMethodManager cleanMethodManager;
 	
 	private PackingRecordClassifyBasketManager packingRecordClassifyBasketManager;
+	
+	private ClassifiedItemManager classifiedItemManager;
 
+	public void setClassifiedItemManager(ClassifiedItemManager classifiedItemManager) {
+		this.classifiedItemManager = classifiedItemManager;
+	}
+
 	public void setPackingRecordClassifyBasketManager(
 			PackingRecordClassifyBasketManager packingRecordClassifyBasketManager) {
 		this.packingRecordClassifyBasketManager = packingRecordClassifyBasketManager;
@@ -306,19 +312,7 @@
 		}
 		return null;
 	}
-
 	/**
-	 * 删除放入篮筐的已分类材料
-	 * 
-	 * @param classifiedItem
-	 */
-	@Override
-	public void deleteClassifiedItem(ClassifiedItem classifiedItem) {
-		if(classifiedItem != null){
-			objectDao.delete(classifiedItem);
-		}
-	}
-	/**
 	 * 删除从篮筐移除了的已分类物品
 	 */
 	@Override
@@ -591,7 +585,7 @@
 				// 删除旧入筐对象
 				classifiedItems.removeAll(delteClassifiedItems);
 				for (ClassifiedItem delteItem : delteClassifiedItems) {
-					deleteClassifiedItem(delteItem);
+					classifiedItemManager.delete(delteItem);
 				}
 
 				// 批量更新待清洗对象
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r19270 -r19703
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 19270)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 19703)
@@ -2,6 +2,7 @@
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@page import="java.util.Date"%>
@@ -28,767 +29,59 @@
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script src="${ctx}/js/magnificPopup/jquery.magnific-popup.js"></script>
 <script type="text/javascript" src="commonRecycle.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/customIntoBasket.js"></script>
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <link rel="stylesheet" href="${ctx}/jquery/jquery-ui-1.10.2/css/south-street/jquery-ui-1.10.2.custom.css" type="text/css" />
 
 <link rel="stylesheet" href="${ctx}/jquery/jquery-ui-1.10.2/css/smoothness/jquery-ui.css">
 <script src="${ctx}/jquery/jquery-ui-1.10.2/jquery-ui.js"></script>
-
-</head>
-
  <script>
+ var PACKAGE_TYPE_SPLIT = "<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>";
+ var PACKAGE_TYPE_FOREIGN = "<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>";
  var resolution = '${param.resolution}';
- var progressbar = null;
- var progressLabel= null;
+ var param_data = '${param.data}';
+ 
  layer.config({
 		extend: 'myskin/style.css', //加载您的扩展样式
 	  	skin: 'layer-ext-myskin'
 	});
-$(function() {
-	    progressbar = $("#progressbar");
-	    progressLabel = $(".progress-label");
-	    progressbar.progressbar({
-		      value: false,
-		      change: function() {
-		        progressLabel.text( parseInt(progressbar.progressbar("value")) + "%");
-		      },
-		      complete: function() {
-		        progressLabel.text( "完成！" );
-		      }
-	   });
-});
+</script>
 
-function progress(i) {
-	progressbar.progressbar( "option", {value: i });
-  }
-  </script>
-
 <script type="text/javascript">
-var ab;
-var lock = false;
-
-//锁定键盘
-function lockup(e){ e.preventDefault(); }
-//高亮层不锁定
-function lockout(e){ e.stopPropagation(); }
-
-function alertDiv(alertWord, hideCloseButton){
-    lock = true;
-    document.getElementById ("showWord").innerHTML = alertWord;
-    if(typeof(hideCloseButton) != 'undefined' && hideCloseButton){
-    	$('#idBoxClose').hide();
-    	$("#progressbar").show();
-    }
-    else{
-    	$('#idBoxClose').show();
-    	$("#progressbar").hide();
-    }
-    
-    ab = new AlertBox("idBox");
-    ab.onShow = function(){
-        if ( lock ) {
-            $$E.addEvent( document, "keydown", lockup );
-            $$E.addEvent( this.box, "keydown", lockout );
-            OverLay.show();
-        }
-    };
-    ab.onClose = function(){
-        $$E.removeEvent( document, "keydown", lockup );
-        $$E.removeEvent( this.box, "keydown", lockout );
-        OverLay.close();
-    };
-    
-    ab.center = true;
-    ab.show();
-}
- function closeDiv(){
-     ab.close();
- }
 var WWWROOT = '${ctx}';
-
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/customIntoBasketStyle.css" rel="stylesheet" type="text/css" />');
-
-function showMessage(message){
-    if(document.getElementById('messageDiv') == null || !$('#messageDiv').dialog('isOpen')){
-        $("<div id=\"messageDiv\"><font size=7>"+message+"</font></div>").dialog({
-            title : '提示',
-            width :520,
-            modal: true,
-            show: {
-                effect: "explode",
-                duration: 1000
-            },
-            hide: {
-                effect: "explode",
-                duration: 1000
-            },
-            buttons: {
-              '关闭': function() {
-                  $(this).dialog( "close" );
-              }
-            }
-        });
-    }
-}
-var barcodeTemp = '';
-
-//删除整个篮筐
-function deleteBasket(deleteButton){
-	var liElement = $(deleteButton).parent().parent();
-	var delBasktJsonStr = liElement.find('input').val();
-	var basketJson = JSON.parse(delBasktJsonStr);
-	$("#basketsUl li").each(function(){
-       	var hideStr = $(this).find('input').val();
-       	var hiddenjson = JSON.parse(hideStr);
-       	var actionBasketBarcode = basketJson.barcode;
-       	if(hiddenjson.barcode == actionBasketBarcode){
-       		$(this).find('dl').children().each(function(i,element){
-       			if($(this).attr('class') == 'delBtn'){
-       				var deleteButton = $(this).find('a');
-       				deleteBasketItem(deleteButton);
-       			}
-       		});
-       		$(this).remove();
-       	}
-    });
-}
-//删除篮筐中的物品
-function deleteBasketItem(deleteButton){
-	var hideElement = $(deleteButton).parent().prev().prev().prev().prev();
-	var tousseNameElement = $(deleteButton).parent().prev().prev().prev();
- 	var materialNameElement = $(deleteButton).parent().prev().prev();
-	var amountElement = $(deleteButton).parent().prev();
-	var delElement = $(deleteButton).parent();
-	
-	var item = JSON.parse(hideElement.val());
-	hideElement.remove();
-	tousseNameElement.remove();
-	materialNameElement.remove();
-	amountElement.remove();
-	delElement.remove();
-	
-	var intoBasketAmount = item.amount;
-	var idCardBarcode = item.idCardBarcode;
-	
-	$('#tousseItemTable').children().first().children().each(function(i,element){
-        if($('#tousseName'+i).val() == item.tousseName &&　
-        		$('#materialName'+i).val() == item.materialName &&　
-        		$('#idCardBarcode'+i).val() == idCardBarcode){
-        	
-        	$('#tousseItemsTr'+i).show();
-        	$('#deleted'+i).val('0');
-        	
-        	var loadedAmount = parseInt($('#loadedAmount'+i).val(),10);
-        	$('#loadedAmount'+i).val(loadedAmount - intoBasketAmount );
-        }
-    });
-}
-
-//清理视图列表
-function cleanTableList(){
-    $("#tousseItemTable").empty();
-    $("#basketsUl").empty();
-}
-
-function cleanMaterialAndBasketTableList(){
-    $("#basketsUl").empty();
-}
-
-function stopBubble(e) {
-    //如果提供了事件对象，则这是一个非IE浏览器
-    if ( e && e.stopPropagation )
-        //因此它支持W3C的stopPropagation()方法
-        e.stopPropagation();
-    else
-        //否则，我们需要使用IE的方式来取消事件冒泡
-        window.event.cancelBubble = true;
-}
-//阻止浏览器的默认行为
-function stopDefault( e ) {
-    //阻止默认浏览器动作(W3C)
-    if ( e && e.preventDefault )
-        e.preventDefault();
-    //IE中阻止函数器默认动作的方式
-    else
-        window.event.returnValue = false;
-    return false;
-}
-
-//在页面无需将光标定位在输入框相应全局的扫描枪事件
-var barcodeTemp = '';
-var basketBarcode = null;
-var tempBasketBarcode = "";
-function showKeyDown(){
-    if(event.keyCode == 48 || event.keyCode == 96){
-        barcodeTemp += '0';
-    }else if(event.keyCode == 49 || event.keyCode == 97){
-        barcodeTemp += '1';
-    }else if(event.keyCode == 50 || event.keyCode == 98){
-        barcodeTemp += '2';
-    }else if(event.keyCode == 51 || event.keyCode == 99){
-        barcodeTemp += '3';
-    }else if(event.keyCode == 52 || event.keyCode == 100){
-        barcodeTemp += '4';
-    }else if(event.keyCode == 53 || event.keyCode == 101){
-        barcodeTemp += '5';
-    }else if(event.keyCode == 54 || event.keyCode == 102){
-        barcodeTemp += '6';
-    }else if(event.keyCode == 55 || event.keyCode == 103){
-        barcodeTemp += '7';
-    }else if(event.keyCode == 56 || event.keyCode == 104){
-        barcodeTemp += '8';
-    }else if(event.keyCode == 57 || event.keyCode == 105){
-        barcodeTemp += '9';
-    }else if(event.keyCode == 13){
-        loadBarcodeDevice(barcodeTemp);
-    }
-    
-    stopBubble(event);
-    stopDefault(event);
-}
-
-// 扫描第二个篮框时，取消合并提示，默认不合并
-function mergedBasket(){
-    return false;
-}
-function loadBarcodeDevice(barcodeTemp){
-    if(barcodeTemp.length >= 9){
-        var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
-        barcodeTemp='';
-        $.ajax({
-            type:'get',
-            url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getBarcodeInfo.do?time='+new Date()+'&barcode='+barcode,
-            dataType:'json',
-            success:function(msg){
-            	if(msg.errorMessage != null ){
-            		alertDiv(msg.errorMessage);
-            	}else if(msg.basket != null){
-            		var isBasketLoaded = false;
-                    var currentNode;
-                     
-                   	var basketItem = msg.basket;
-                   	$("#basketsUl li").each(function(){
-                   		 var hide = $(this).find('input');
-                  			 var item =  JSON.parse(hide.val());
-                            if(item.barcode == basketItem.containerBarcode){
-                                    isBasketLoaded = true;
-                                    currentNode = $(this);
-                                    return false;
-                            }
-                      });
-                   	  $("#seleniumResult").val("1");
-                      if(isBasketLoaded){
-                           //将篮筐放置在最前面
-                           $("#basketsUl").prepend(currentNode);
-                           toggleItems(currentNode.find('span')[0]);
-                      }else{
-                       	var basketElement = '<li>';
-                        	basketElement += '<input type="hidden">';
-                        	basketElement += '<i>';
-                        	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this,\''+basketItem.containerBarcode+'\',\''+basketItem.id+'\');">删除</a>';
-                        	basketElement += '</i>';
-                        	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
-                        	basketElement += '<font class="status-empty-yellow">'+basketItem.containerName+'</font>';
-                        	basketElement += '<dl class="sed clearfix"></dl>';
-                        	basketElement += '</li>';
-                       	var obj = $(basketElement);
-                          $("#basketsUl").prepend(obj);
-                          var json = getBasketJSON(basketItem.id,basketItem.containerBarcode,basketItem.containerName,basketItem.washClassifyType);
-                          $("#basketsUl li:first").find('input').val(json);
-                          toggleItems(obj.find('span')[0]);
-                      }
-                      refreshBasketStatus();
-            	}else{
-                    alertDiv('没有找到该条码所对应的信息。');
-                }
-                $("#codeScan").val("");
-            },
-            error:function(){}
-        });
-    }else{
-        alertDiv('条码长度不符合规范。');
-    }
-}
-
-function getBasketJSON(itemId,barcode,containerName,washClassifyType){
-	var json = {};
-	json.classifyBasketId = itemId;
-	json.barcode = barcode;
-	json.containerName = containerName;
-	json.washClassifyType = washClassifyType;
-	return JSON.stringify(json);
-}
-
-function getBasketItemJSON(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,
-		idCardBarcode,putBasketMaxAmount,materialInstanceId){
-	var json = {};
-	json.tousseName = tousseName;
-	json.materialName = materialName;
-	json.amount = materialAmount;//td显示的数量
-	json.tousseAmount = tousseAmount;//材料相对的包数量
-	json.tousseDefinitionID = tousseDefinitionID;
-	json.idCardBarcode = idCardBarcode;
-	json.putBasketMaxAmount = putBasketMaxAmount;
-	json.materialInstanceId = materialInstanceId;
-	return JSON.stringify(json);
-}
-
-function getScanedGoods(){
-	var basketJsonArray = new Array();
-	$("#basketsUl li").each(function(){
-       	var hideStr = $(this).find('input').val();
-       	var hiddenjson = JSON.parse(hideStr);
-       	
-       	var scanedGoodsArray = new Array();
-       	
-   		$(this).find('dl').children().each(function(i,element){
-   			if($(this).attr('type') == 'hidden'){
-   				var itemJson = $(this).val();
-   				var json = JSON.parse(itemJson);
-   				if(json.classifiedItemId == ""){
-       				var type = json.type;
-       				var name = json.tousseName;
-       				if(type == '材料'){
-       					name = json.materialName;
-       				}
-       				scanedGoodsArray.push({
-       					name:name,
-       					tousseDefinitionID:json.tousseDefinitionID,
-       					type:json.type,
-       					amount:json.amount,
-       					idCardBarcode : json.idCardBarcode,
-       					putBasketMaxAmount:json.putBasketMaxAmount
-       				});
-   				}
-   			}
-   		});
-   		
-   		basketJsonArray.push({
-   			barcode : hiddenjson.barcode,
-   			washClassifyType : hiddenjson.washClassifyType,
-   			scanedGoods : scanedGoodsArray
-       	});
-    });
-	return basketJsonArray;
-}
-function getBasketElement(basketBarcode){
-	var findEl = null;
-	$("#basketsUl li").each(function(index,element){
-		var basketStr = $(this).find('input').val();
-		var basket =  JSON.parse(basketStr);
-		if(basket){
-			if(basket.barcode == basketBarcode){
-				findEl = $(this);
-				return false;
-			}
-		}
-	});
-	return findEl;
-}
-/**
- * 创建物品入筐
- */
-function addBasketItemElement(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,idCardBarcode,putBasketMaxAmount,
-		batchToBasket,materialInstanceId){
-	var success = false;
-	if(batchToBasket && sstsConfig.enableMaterialWashclasifyInCustomRecycle){
-		var params = getScanedGoods()
-		 DWREngine.setAsync(false);
-		 RecyclingRecordTableManager.putMaterialIntoBasket(materialInstanceId,materialAmount,JSON.stringify(params),function(result){
-		    	var jsonObj = JSON.parse(result);
-		    	
-		    	if(!jsonObj.success){
-		    		//if(!batchToBasket){
-		    			alertDiv(jsonObj.message);
-		    		//}
-		    	}else{
-		    		var materials = jsonObj.materials;
-	    			if(materials == null){
-	    				alertDiv("异常数据，请联系管理员！");
-	    				success = false;
-	    			}else{
-	    				for(var i = 0;i < materials.length;i++){
-		        			var item = materials[i];
-		        			var basketElement = getBasketElement(item.basketBarcode);
-		        			
-		        			addItemToThisBasket(basketElement,tousseName,item.materialName,item.materialAmount,tousseAmount,
-		        					tousseDefinitionID,idCardBarcode,item.putBasketMaxAmount,materialInstanceId);
-		        		}
-	    				success = true;
-	    			}
-		    	}
-		 });
-		 DWREngine.setAsync(true);
-	}else{
-		addItemToThisBasket($("#basketsUl li:first"),tousseName,materialName,materialAmount,tousseAmount,
-				tousseDefinitionID,idCardBarcode,putBasketMaxAmount,materialInstanceId);
-		success = true;
-	}
-	return success;
-}
-/**
- * 将物品添加到篮筐
- * trElement basketsUl中的li元素，通过jquery封装的对象
- */
-function addItemToThisBasket(trElement,tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,
-		idCardBarcode,putBasketMaxAmount,materialInstanceId){
-	if(trElement == null){
-		//目前不可能会有这种情况
-		return;
-	}
-	var basketElement = trElement.find('dl[class="sed clearfix"]:eq(0)');
-	var basketHidenValue =  trElement.find('input').val();
-	//var basketElement = $('dl[class="sed clearfix"]:eq(0)');
-	//var basketHidenValue =  $("#basketsUl li:first").find('input').val();
-	var showName = tousseName;
-	if(idCardBarcode != ""){
-		showName += "["+idCardBarcode+"]";
-	}
-	
-	var isExist = false;
-	
-	trElement.find('dl').children().each(function(){
-		if($(this).attr('type') == 'hidden'){
-			var hideStr = $(this).val();
-   			var json = JSON.parse(hideStr);
-   			if(json.tousseDefinitionID == tousseDefinitionID && json.materialName == materialName && json.idCardBarcode == idCardBarcode){
-				isExist = true;
-				json.amount = (json.amount + materialAmount);
-				$(this).val(JSON.stringify(json));
-				$(this).next().next().next().text(json.amount);
-				return false;
-			}
-		}
-	});
-	
-	if(!isExist){
-		var element = '<input type="hidden" value="">';
-			element += '<dd class="tousseName">' + showName + '</dd>';
-			element += '<dd class="materialName">' + materialName + '</dd>';
-			element += '<dd class="materialNum">' + materialAmount + '</dd>';
-			element += '<dd class="delBtn"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);refreshBasketStatus();">删除</a></dd>';
-		var json = getBasketItemJSON(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,idCardBarcode,
-				putBasketMaxAmount,materialInstanceId);
-		basketElement.prepend($(element));
-		basketElement.find("input:first").val(json);
-	}
-}
-
-//将器械包放入篮筐中
-function putMaterialInBasket(row,batchToBasket){
-	var inputSuccess = false;
-    if($('#basketsUl').children().length > 0){
-        var tousseName = $('#tousseName'+row).val();
-        var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
-        var materialName = $('#materialName'+row).val();
-        var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
-        var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
-        var loadedAmount = parseInt($('#loadedAmount'+row).val(),10);
-        var tousseAmount = parseInt($('#tousseAmount'+row).val(),10);
-        var tousseDefinitionID = $('#tousseDefinitionID'+row).val();
-        var idCardBarcode = $('#idCardBarcode'+row).val();
-        var putBasketMaxAmount = $('#putBasketMaxAmount'+row).val();
-        var washClassifyType = $('#washClassifyType'+row).val();
-        var materialInstanceId = $('#materialInstanceId'+row).val();
-        
-        var insertBasketAmount = recycleAmount - loadedAmount;
-        if(insertBasketAmount <= 0){
-        	 alertDiv('放入篮筐的数量必须大于0！');
-        	return false;
-        }
-		
-        var success = addBasketItemElement(tousseName,materialName,insertBasketAmount,tousseAmount,tousseDefinitionID,idCardBarcode,
-        		putBasketMaxAmount,batchToBasket,materialInstanceId);
-
-        if(success){
-        	$('#loadedAmount'+row).val(loadedAmount + insertBasketAmount)
-            
-            if(applicationAmount == parseInt($('#loadedAmount'+row).val(),10)){
-    	        deleteTousseItem(row);
-            }
-        	inputSuccess = true;
-        }
-    }else{
-        alertDiv('请先扫描篮筐条码。');
-    }
-    return inputSuccess;
-}
-
-function deleteTousseItem(row){
-    $('#tousseItemsTr'+row).hide();
-    $('#deleted'+row).val('1');
-}
-
-function add(row){
-	var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
-	var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
-    if(recycleAmount >= applicationAmount){
-    	return;
-    }
-    $('#recycleAmount'+row).val(recycleAmount+1);
-}
-
-function reduce(row){
-    var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
-    if(recycleAmount > 0){
-        $('#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='+resolution+'&row='+row,
-         area : [width + 'px' , height + 'px'],
-         border : [5, 0.3, '#fff', true],
-         closeBtn : [2 , true],
-         offset : ['250px','']
-    });
-}
-function changeRecycleAmount(){
-	//空实现。主要是updateAmount.jsp中有调用这个方法
-}
-var layerIndex;
-function closeLayer(){
-	layer.close(layerIndex);
-	layerIndex = null;
-}
-/**
- * 添加待回收的材料项
- */
-function addWaitRecycleMaterialItem(row,materialItem){
-	
-	var tousseName = materialItem.tousseName;
-	var materialName = materialItem.materialName;
-	var recycleAmount = materialItem.amount;
-	var tousseDefinitionID = materialItem.tousseDefinitionID;
-	var tousseAmount = materialItem.tousseAmountForMaterial;
-	var idCardBarcode = materialItem.idCardBarcode;
-	var putBasketMaxAmount = materialItem.putBasketMaxAmount;
-	var washClassifyType = materialItem.washClassifyType;
-	var materialInstanceId = materialItem.materialInstanceId
-	
-     var trElement = $('<tr id="tousseItemsTr'+row+'"><td width="130px" style="font-size: 25px;">'+
-               '<input type="hidden" id="tousseDefinitionID'+row+'" name="tousseDefinitionID'+row+'" value="'+tousseDefinitionID+'"/>'+
-               '<input type="hidden" id="deleted'+row+'" name="deleted'+row+'" value="0"/>'+
-               '<input type="hidden" id="putBasketMaxAmount'+row+'" name="putBasketMaxAmount'+row+'" value="'+putBasketMaxAmount+'"/>' +
-               '<input type="hidden" id="tousseName'+row+'" name="tousseName'+row+'" value="'+tousseName+'"/>'+
-               '<input type="hidden" id="materialName'+row+'" name="materialName'+row+'" value="'+materialName+'"/>' +
-               '<input type="hidden" id="idCardBarcode'+row+'" name="idCardBarcode'+row+'" value="'+idCardBarcode+'"/>'+
-               '<input type="hidden" id="washClassifyType'+row+'" name="washClassifyType'+row+'" value="'+washClassifyType+'"/>'+
-               '<input type="hidden" id="materialInstanceId'+row+'" name="materialInstanceId'+row+'" value="'+materialInstanceId+'"/>'+
-               '<input type="hidden" id="tousseAmount'+row+'" name="tousseAmount'+row+'" value="'+tousseAmount+'"/>' + idCardBarcode + '</td>' +
-               '<td width="250px" style="font-size: 25px;">' + tousseName + '</td>' +
-               '<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><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" value="0"/></td>'+
-               '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putMaterialInBasket('+row+',false);refreshBasketStatus();">入筐</a></td>'+
-               '</tr>');
-    $("#tousseItemTable").append(trElement);
-    return true;
-}
-
-//待装载篮筐视图中的树形菜单伸缩的处理
-function toggleItems(spanElement){
-    $(spanElement).toggleClass("minus");
-    $(spanElement).nextAll('.sed').toggle();
-}
-
-function submitCheck(){
-    var isThereRecycleAmountEmpty = false;
-    $('#tousseItemTable').children().first().children().each(function(index,element){
-        if($('#deleted'+index).val() == '0'){
-             isThereRecycleAmountEmpty = true;
-             return false;
-        }
-    });
-    if(isThereRecycleAmountEmpty){
-        alertDiv('还有物品未入筐，请全部入筐后在保存！');
-        return false;
-    }
-    return true;
-}
-
-var btSave=false;
-function doSaveAction(){
-   if(submitCheck()){
-	   var array = new Array();
-	   $("#basketsUl").children().each(function(){
-	        var id = null;
-	        var basketBarcode = null;
-	        var containerName = null;
-	        var washClassifyType = null;
-	        var classifiedItemsInfo = {};
-	        $(this).children().each(function(){
-	            if($(this).is('input') && $(this).attr('type') == 'hidden'){
-	                var baskethideStr = $(this).val();
-	                var basketJson = JSON.parse(baskethideStr);
-	               		basketBarcode = basketJson.barcode;
-	                    id = basketJson.classifyBasketId;
-	                    containerName = basketJson.containerName;
-	                    washClassifyType = basketJson.washClassifyType;
-	            }else if($(this).is('dl')){
-	                $(this).children().each(function(i,element){
-	           			 if($(this).attr('type') == 'hidden'){
-	           				 var itemJson = $(this).val();
-	           				 var json = JSON.parse(itemJson);
-	           				 var obj = {};
-		                     obj.basketBarcode = basketBarcode;
-		                     obj.containerName = containerName;
-		                     obj.washClassifyType = washClassifyType;
-		 					 obj.basketId = id;
-		 					 obj.materialName = json.materialName;
-		 					 obj.materialAmount = json.amount;
-		 					 obj.tousseName = json.tousseName;
-		 					 obj.tousseAmountForMaterial = json.tousseAmount;
-		 					 obj.tousseDefinitionID = json.tousseDefinitionID;
-		 					 obj.idCardBarcode = json.idCardBarcode;
-		 					 obj.putBasketMaxAmount = json.putBasketMaxAmount;
-		 					 var isExist = false;
-		 					 var len = array.length;
-		 					 for(var j = 0;j < len;j++){
-		 						 if(array[j].tousseDefinitionID == json.tousseDefinitionID){
-		 							isExist = true;
-		 							var materials = array[j].materials;
-		 							if(materials == null){
-		 								materials = new Array();
-		 							}
-		 							var m_len = materials.length;
-		 							var idCardIsExist = false;
-		 							for(var n = 0 ; n < m_len ; n++){
-		 								if(materials[n].idCardBarcode == json.idCardBarcode){
-		 									idCardIsExist = true;
-		 								}
-		 							}
-		 							if(!idCardIsExist){
-		 								array[j].recycleAmount = (parseInt(array[j].recycleAmount) + parseInt(json.tousseAmount));
-		 							}
-		 							materials[m_len] = obj;
-		 						 }
-		 					 }
-		 					 if(!isExist){
-		 						array[len] = {};
-		 						array[len].tousseDefinitionID = json.tousseDefinitionID;
-		 						array[len].tousseName = json.tousseName;
-		 						array[len].recycleAmount = json.tousseAmount;
-		 						array[len].idCardBarcode = json.idCardBarcode;
-		 						array[len].materials = new Array();
-		 						array[len].materials[0] = obj;
-		 					 }
-	           			}
-	                });
-	            }
-	        });
-	    });
-	   window.opener.customIntoBasketFun(array);
-	   window.close();
-	}
-}
-
-function cancel() {
-	window.close();
-}
-//一键入筐
-function allInputBasket(){
-	$('#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(amount > 0){
-        		putMaterialInBasket(row,true);
-        		//var success = putMaterialInBasket(row);
-            	//if(!success){
-            		//return false;
-            	//}
-        	}
-        }
-	});
-	refreshBasketStatus();
-}
-function loadItem() {
-	
-	if(sstsConfig.recycleAllMaterialIntoBasket){
-		var divElement = document.getElementById('divElement');
-		divElement.innerHTML = '<input type="button" value="一键入筐" class="btn-h" onclick="allInputBasket();"/>';
-	}
-	
-	$("#tousseItemTable").empty();
-    $("#basketsUl").empty();
-	document.onkeydown = showKeyDown;
-	var data = '${param.data}';
-	$.ajax({
-		type : 'post',
-		url : WWWROOT + '/disinfectSystem/recyclingRecordAction!loadUnCleanedEntirelyMaterial.do?data=' + data,
-		dataType : 'json',
-		success : function(msg) {
-			for ( var i = 0; i < msg.length; i++) {
-				var materialAmount = msg[i].amount;
-
-				if(materialAmount <= 0){
-					continue;
-				}
-				addWaitRecycleMaterialItem(i,msg[i]);
-			}
-		},
-		error : function() {
-		}
-	});
-}
-
-function encodeAll(text) {
-	var encoded = encodeURI(text);
-	encoded = encoded.replace('#', '%23');// 对#号进行转码
-	return encoded;
-}
-
-function refreshBasketStatus(){
-	$("#basketsUl > li").each(function(){
-  		 var count = $(this).find('dl[class="sed clearfix"]').children().length;
-  		 if(count == 0){
-  			$(this).find('font').addClass('status-empty-yellow');
-  		 }else{
-  			$(this).find('font').removeClass('status-empty-yellow');
-  		 }
-     });
-}
-
 	//如果用jquery的ready方法会报错,因为dwr的查询需要时间会造成页面的js方法认不到的问题
 </script>
-<body onload="zoomTouchScreenViewToActualScreenSize(2600,1300);loadItem();">
-
-
+</head>
+<body onload="zoomTouchScreenViewToActualScreenSize(2600,1462);loadItem();">
 <!-- alertDIV -->
 <style>
 .lightbox{width:400px;background:#FFFFFF;border:5px solid #ccc;line-height:35px;display:none; margin:0;}
 .lightbox dt{background:#f4f4f4;padding:5px;}
 .lightbox dd{ padding:20px; margin:0;}
+.basketName{
+	display: inline-block;
+    width: 345px;
+}
 .status-empty-yellow {
     background-color: #f2e877;
+}
+.status-implant-green {
+    background-color: #A5D56F;
     display: inline-block;
-    width: 350px;
 }
+.containImplant{
+	color:red;
+	float:right;
+}
 </style>
 <dl id="idBox" class="lightbox" style="top:10%;left:5%;">
     <dt><b style="font-size:20px">提示信息</b> </dt>
     <dd>
     	<div id="progressbar" style="width:355px;display:none"><div class="progress-label">提交中...</div></div>
         <span id="showWord" style="font-size:35px">条码长度不符合规范！</span>
-        <br>
-        </br>
+        <br/>
         <center>
             <input type="button" onclick="closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value=" X " id="idBoxClose" />
         </center>
@@ -815,7 +108,14 @@
         </form>
     </div>
     
-    <div id="divElement"></div>
+    <div id="divElement">
+    	<input id="allIntoBasket" type="button" value="一键入筐" class="btn-h" onclick="allInputBasket();"/>
+    	<div class="splitInfo">
+    		<span id="spanToolsInfo"></span>
+    		<br/>
+    		<span id="spanImplantInfo"></span>
+    	</div>
+    </div>
     
     <!--操作 end-->
     <!--表单 start-->
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/table_bg_custom.gif
===================================================================
diff -u
Binary files differ
Index: forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
===================================================================
diff -u -r18645 -r19703
--- forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java	(.../JSONUtil.java)	(revision 18645)
+++ forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java	(.../JSONUtil.java)	(revision 19703)
@@ -619,6 +619,12 @@
 		}
 		return new ArrayList<>();
 	}
+	
+	public static JsonConfig buildJsonConfig(String... includeProperties){
+		JsonConfig jc = new JsonConfig();
+		jc.setJsonPropertyFilter(new JsonIncludePropertyFilter(includeProperties));
+		return jc;
+	}
 
 }
 
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r19642 -r19703
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 19642)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 19703)
@@ -2466,7 +2466,8 @@
 	
 	public void loadUnCleanedEntirelyMaterial(){
 		String data = StrutsParamUtils.getPraramValue("data", null);
-		JSONArray result = new JSONArray();
+		JSONArray materialItem = new JSONArray();
+		TousseDefinition td = null;
 		if(StringUtils.isNotBlank(data)){
 			JSONArray array = JSONArray.fromObject(data);
 			if(array != null && array.size() > 0){
@@ -2475,7 +2476,7 @@
 					String tousseId = item.optString("tousseId");
 					Integer recycleAmount = item.optInt("recycleAmount");
 					String idCardBarcode = item.optString("idCardBarcode");
-					TousseDefinition td = tousseDefinitionManager.get(tousseId);
+					td = tousseDefinitionManager.get(tousseId);
 					if (td != null) {
 						List<MaterialInstance> list = td.getMaterialInstances();
 						for (MaterialInstance mi : list) {
@@ -2493,14 +2494,16 @@
 								obj.put("tousseAmountForMaterial", recycleAmount);
 								obj.put("idCardBarcode", idCardBarcode);
 								obj.put("putBasketMaxAmount", md.getIntoBasketMaxAmount() == null ? 0 : md.getIntoBasketMaxAmount());
-								result.add(obj);
+								obj.put("isImplant", td.isForeignOrSplitTousse()?StringTools.defaultString(mi.getIsImplant()):Constants.STR_NO);
+								materialItem.add(obj);
 							}
 						}
 					}
 				}
 			}
 		}
-		
+		JSONObject result = JSONUtil.buildJsonObject(true,materialItem);
+		result.put("tousseDefinition",JSONObject.fromObject(td, JSONUtil.buildJsonConfig("tousseType")));
 		StrutsResponseUtils.output(result);
 		
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(revision 19703)
@@ -0,0 +1,842 @@
+var ab;
+var lock = false;
+var progressbar = null;
+var progressLabel= null;
+
+$(function() {
+    progressbar = $("#progressbar");
+    progressLabel = $(".progress-label");
+    progressbar.progressbar({
+	      value: false,
+	      change: function() {
+	        progressLabel.text( parseInt(progressbar.progressbar("value")) + "%");
+	      },
+	      complete: function() {
+	        progressLabel.text( "完成！" );
+	      }
+   });
+});
+function progress(i) {
+	progressbar.progressbar( "option", {value: i });
+}
+//器械包的类型
+var tousseType = "";
+
+//锁定键盘
+function lockup(e){ e.preventDefault(); }
+//高亮层不锁定
+function lockout(e){ e.stopPropagation(); }
+
+function alertDiv(alertWord, hideCloseButton){
+    lock = true;
+    document.getElementById ("showWord").innerHTML = alertWord;
+    if(typeof(hideCloseButton) != 'undefined' && hideCloseButton){
+    	$('#idBoxClose').hide();
+    	$("#progressbar").show();
+    }
+    else{
+    	$('#idBoxClose').show();
+    	$("#progressbar").hide();
+    }
+    
+    ab = new AlertBox("idBox");
+    ab.onShow = function(){
+        if ( lock ) {
+            $$E.addEvent( document, "keydown", lockup );
+            $$E.addEvent( this.box, "keydown", lockout );
+            OverLay.show();
+        }
+    };
+    ab.onClose = function(){
+        $$E.removeEvent( document, "keydown", lockup );
+        $$E.removeEvent( this.box, "keydown", lockout );
+        OverLay.close();
+    };
+    
+    ab.center = true;
+    ab.show();
+}
+function closeDiv(){
+	ab.close();
+}
+ 
+function showMessage(message){
+	if(document.getElementById('messageDiv') == null || !$('#messageDiv').dialog('isOpen')){
+	    $("<div id=\"messageDiv\"><font size=7>"+message+"</font></div>").dialog({
+	        title : '提示',
+	        width :520,
+	        modal: true,
+	        show: {
+	            effect: "explode",
+	            duration: 1000
+	        },
+	        hide: {
+	            effect: "explode",
+	            duration: 1000
+	        },
+	        buttons: {
+	          '关闭': function() {
+	              $(this).dialog( "close" );
+	          }
+	        }
+	    });
+	}
+}
+var barcodeTemp = '';
+
+//删除整个篮筐
+function deleteBasket(deleteButton){
+	var liElement = $(deleteButton).parent().parent();
+	var delBasktJsonStr = liElement.find('input').val();
+	var basketJson = JSON.parse(delBasktJsonStr);
+	$("#basketsUl li").each(function(){
+       	var hideStr = $(this).find('input').val();
+       	var hiddenjson = JSON.parse(hideStr);
+       	var actionBasketBarcode = basketJson.barcode;
+       	if(hiddenjson.barcode == actionBasketBarcode){
+       		$(this).find('dl').children().each(function(i,element){
+       			if($(this).attr('class') == 'delBtn'){
+       				var deleteButton = $(this).find('a');
+       				deleteBasketItem(deleteButton);
+       			}
+       		});
+       		$(this).remove();
+       	}
+    });
+}
+function removeImplants(removeBtn){
+	var liElement = $(removeBtn).parent().parent();
+	liElement.find('dl > input').each(function(i,element){
+		var materialJsonStr = $(this).val();
+		if(materialJsonStr && materialJsonStr.length > 0){
+			var materialJson = JSON.parse(materialJsonStr);
+			if(materialJson.isImplant == "是"){
+				deleteBasketItem($(this).nextAll(".delBtn").children("a.btn").first());
+			}
+		}
+	});
+	refreshBasketStatus();
+}
+//删除篮筐中的物品
+function deleteBasketItem(deleteButton){
+	var hideElement = $(deleteButton).parent().prev().prev().prev().prev();
+	var tousseNameElement = $(deleteButton).parent().prev().prev().prev();
+ 	var materialNameElement = $(deleteButton).parent().prev().prev();
+	var amountElement = $(deleteButton).parent().prev();
+	var delElement = $(deleteButton).parent();
+	
+	var item = JSON.parse(hideElement.val());
+	hideElement.remove();
+	tousseNameElement.remove();
+	materialNameElement.remove();
+	amountElement.remove();
+	delElement.remove();
+	
+	var intoBasketAmount = item.amount;
+	var idCardBarcode = item.idCardBarcode;
+	
+	$('#tousseItemTable').children().first().children().each(function(i,element){
+        if($('#tousseName'+i).val() == item.tousseName &&　
+        		$('#materialName'+i).val() == item.materialName &&　
+        		$('#idCardBarcode'+i).val() == idCardBarcode){
+        	
+        	$('#tousseItemsTr'+i).show();
+        	$('#deleted'+i).val('0');
+        	
+        	var loadedAmount = parseInt($('#loadedAmount'+i).val(),10);
+        	$('#loadedAmount'+i).val(loadedAmount - intoBasketAmount );
+        }
+    });
+}
+
+//清理视图列表
+function cleanTableList(){
+    $("#tousseItemTable").empty();
+    $("#basketsUl").empty();
+}
+
+function cleanMaterialAndBasketTableList(){
+    $("#basketsUl").empty();
+}
+
+function stopBubble(e) {
+    //如果提供了事件对象，则这是一个非IE浏览器
+    if ( e && e.stopPropagation )
+        //因此它支持W3C的stopPropagation()方法
+        e.stopPropagation();
+    else
+        //否则，我们需要使用IE的方式来取消事件冒泡
+        window.event.cancelBubble = true;
+}
+//阻止浏览器的默认行为
+function stopDefault( e ) {
+    //阻止默认浏览器动作(W3C)
+    if ( e && e.preventDefault )
+        e.preventDefault();
+    //IE中阻止函数器默认动作的方式
+    else
+        window.event.returnValue = false;
+    return false;
+}
+
+//在页面无需将光标定位在输入框相应全局的扫描枪事件
+var barcodeTemp = '';
+var basketBarcode = null;
+var tempBasketBarcode = "";
+function showKeyDown(){
+    if(event.keyCode == 48 || event.keyCode == 96){
+        barcodeTemp += '0';
+    }else if(event.keyCode == 49 || event.keyCode == 97){
+        barcodeTemp += '1';
+    }else if(event.keyCode == 50 || event.keyCode == 98){
+        barcodeTemp += '2';
+    }else if(event.keyCode == 51 || event.keyCode == 99){
+        barcodeTemp += '3';
+    }else if(event.keyCode == 52 || event.keyCode == 100){
+        barcodeTemp += '4';
+    }else if(event.keyCode == 53 || event.keyCode == 101){
+        barcodeTemp += '5';
+    }else if(event.keyCode == 54 || event.keyCode == 102){
+        barcodeTemp += '6';
+    }else if(event.keyCode == 55 || event.keyCode == 103){
+        barcodeTemp += '7';
+    }else if(event.keyCode == 56 || event.keyCode == 104){
+        barcodeTemp += '8';
+    }else if(event.keyCode == 57 || event.keyCode == 105){
+        barcodeTemp += '9';
+    }else if(event.keyCode == 13){
+        loadBarcodeDevice(barcodeTemp);
+    }
+    
+    stopBubble(event);
+    stopDefault(event);
+}
+
+// 扫描第二个篮框时，取消合并提示，默认不合并
+function mergedBasket(){
+    return false;
+}
+function loadBarcodeDevice(barcodeTemp){
+    if(barcodeTemp.length >= 9){
+        var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
+        barcodeTemp='';
+        $.ajax({
+            type:'get',
+            url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getBarcodeInfo.do?time='+new Date()+'&barcode='+barcode,
+            dataType:'json',
+            success:function(msg){
+            	if(msg.errorMessage != null ){
+            		alertDiv(msg.errorMessage);
+            	}else if(msg.basket != null){
+            		var isBasketLoaded = false;
+                    var currentNode;
+                     
+                   	var basketItem = msg.basket;
+                   	$("#basketsUl li").each(function(){
+                   		 var hide = $(this).find('input');
+                  			 var item =  JSON.parse(hide.val());
+                            if(item.barcode == basketItem.containerBarcode){
+                                    isBasketLoaded = true;
+                                    currentNode = $(this);
+                                    return false;
+                            }
+                      });
+                   	  $("#seleniumResult").val("1");
+                      if(isBasketLoaded){
+                           //将篮筐放置在最前面
+                           $("#basketsUl").prepend(currentNode);
+                           toggleItems(currentNode.find('span')[0]);
+                      }else{
+                    	var hasRemoveImplants = sstsConfig.showSplitInfoInCustomIntoBasket
+                    						&&(tousseType==PACKAGE_TYPE_SPLIT|| tousseType==PACKAGE_TYPE_FOREIGN);
+                       	var basketElement = '<li>';
+                        	basketElement += '<input type="hidden">';
+                        	basketElement += '<i style="text-align:'+(hasRemoveImplants?'right':'center')
+                        						+';width:'+(hasRemoveImplants?223:129)+'px;">';
+                        	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this,\''+basketItem.containerBarcode+'\',\''+basketItem.id+'\');">删除</a>';
+                        	if(hasRemoveImplants){
+                        		basketElement += '<a href="javascript:void(0);" class="btn-removeImplant" onclick="removeImplants(this,\''+basketItem.containerBarcode+'\',\''+basketItem.id+'\');">删除</a>';
+                        	}
+                        	basketElement += '</i>';
+                        	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
+                        	basketElement += '<div class="basketName status-empty-yellow"><div class="containImplant"></div><div>'+basketItem.containerName+'</div></div>'
+                        	basketElement += '<dl class="sed clearfix"></dl>';
+                        	basketElement += '</li>';
+                       	var obj = $(basketElement);
+                          $("#basketsUl").prepend(obj);
+                          var json = getBasketJSON(basketItem.id,basketItem.containerBarcode,basketItem.containerName,basketItem.washClassifyType);
+                          $("#basketsUl li:first").find('input').val(json);
+                          toggleItems(obj.find('span')[0]);
+                      }
+                      refreshBasketStatus();
+            	}else{
+                    alertDiv('没有找到该条码所对应的信息。');
+                }
+                $("#codeScan").val("");
+            },
+            error:function(){}
+        });
+    }else{
+        alertDiv('条码长度不符合规范。');
+    }
+}
+
+function getBasketJSON(itemId,barcode,containerName,washClassifyType){
+	var json = {};
+	json.classifyBasketId = itemId;
+	json.barcode = barcode;
+	json.containerName = containerName;
+	json.washClassifyType = washClassifyType;
+	return JSON.stringify(json);
+}
+
+function getBasketItemJSON(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,
+		idCardBarcode,putBasketMaxAmount,materialInstanceId,isImplant){
+	var json = {};
+	json.tousseName = tousseName;
+	json.materialName = materialName;
+	json.amount = materialAmount;//td显示的数量
+	json.tousseAmount = tousseAmount;//材料相对的包数量
+	json.tousseDefinitionID = tousseDefinitionID;
+	json.idCardBarcode = idCardBarcode;
+	json.putBasketMaxAmount = putBasketMaxAmount;
+	json.materialInstanceId = materialInstanceId;
+	json.isImplant = isImplant;
+	return JSON.stringify(json);
+}
+
+function getScanedGoods(){
+	var basketJsonArray = new Array();
+	$("#basketsUl li").each(function(){
+       	var hideStr = $(this).find('input').val();
+       	var hiddenjson = JSON.parse(hideStr);
+       	
+       	var scanedGoodsArray = new Array();
+       	
+   		$(this).find('dl').children().each(function(i,element){
+   			if($(this).attr('type') == 'hidden'){
+   				var itemJson = $(this).val();
+   				var json = JSON.parse(itemJson);
+   				if(json.classifiedItemId == ""){
+       				var type = json.type;
+       				var name = json.tousseName;
+       				if(type == '材料'){
+       					name = json.materialName;
+       				}
+       				scanedGoodsArray.push({
+       					name:name,
+       					tousseDefinitionID:json.tousseDefinitionID,
+       					type:json.type,
+       					amount:json.amount,
+       					idCardBarcode : json.idCardBarcode,
+       					putBasketMaxAmount:json.putBasketMaxAmount
+       				});
+   				}
+   			}
+   		});
+   		
+   		basketJsonArray.push({
+   			barcode : hiddenjson.barcode,
+   			washClassifyType : hiddenjson.washClassifyType,
+   			scanedGoods : scanedGoodsArray
+       	});
+    });
+	return basketJsonArray;
+}
+function getBasketElement(basketBarcode){
+	var findEl = null;
+	$("#basketsUl li").each(function(index,element){
+		var basketStr = $(this).find('input').val();
+		var basket =  JSON.parse(basketStr);
+		if(basket){
+			if(basket.barcode == basketBarcode){
+				findEl = $(this);
+				return false;
+			}
+		}
+	});
+	return findEl;
+}
+/**
+ * 创建物品入筐
+ */
+function addBasketItemElement(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,idCardBarcode,putBasketMaxAmount,
+		batchToBasket,materialInstanceId,isImplant){
+	var success = false;
+	if(batchToBasket && sstsConfig.enableMaterialWashclasifyInCustomRecycle){
+		var params = getScanedGoods()
+		 DWREngine.setAsync(false);
+		 RecyclingRecordTableManager.putMaterialIntoBasket(materialInstanceId,materialAmount,JSON.stringify(params),function(result){
+		    	var jsonObj = JSON.parse(result);
+		    	
+		    	if(!jsonObj.success){
+		    		//if(!batchToBasket){
+		    			alertDiv(jsonObj.message);
+		    		//}
+		    	}else{
+		    		var materials = jsonObj.materials;
+	    			if(materials == null){
+	    				alertDiv("异常数据，请联系管理员！");
+	    				success = false;
+	    			}else{
+	    				for(var i = 0;i < materials.length;i++){
+		        			var item = materials[i];
+		        			var basketElement = getBasketElement(item.basketBarcode);
+		        			
+		        			addItemToThisBasket(basketElement,tousseName,item.materialName,item.materialAmount,tousseAmount,
+		        					tousseDefinitionID,idCardBarcode,item.putBasketMaxAmount,materialInstanceId,isImplant);
+		        		}
+	    				success = true;
+	    			}
+		    	}
+		 });
+		 DWREngine.setAsync(true);
+	}else{
+		addItemToThisBasket($("#basketsUl li:first"),tousseName,materialName,materialAmount,tousseAmount,
+				tousseDefinitionID,idCardBarcode,putBasketMaxAmount,materialInstanceId,isImplant);
+		success = true;
+	}
+	return success;
+}
+/**
+ * 将物品添加到篮筐
+ * trElement basketsUl中的li元素，通过jquery封装的对象
+ */
+function addItemToThisBasket(trElement,tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,
+		idCardBarcode,putBasketMaxAmount,materialInstanceId,isImplant){
+	if(trElement == null){
+		//目前不可能会有这种情况
+		return;
+	}
+	var basketElement = trElement.find('dl[class="sed clearfix"]:eq(0)');
+	var basketHidenValue =  trElement.find('input').val();
+	//var basketElement = $('dl[class="sed clearfix"]:eq(0)');
+	//var basketHidenValue =  $("#basketsUl li:first").find('input').val();
+	var showName = tousseName;
+	if(idCardBarcode != ""){
+		showName += "["+idCardBarcode+"]";
+	}
+	
+	var isExist = false;
+	
+	trElement.find('dl').children().each(function(){
+		if($(this).attr('type') == 'hidden'){
+			var hideStr = $(this).val();
+   			var json = JSON.parse(hideStr);
+   			if(json.tousseDefinitionID == tousseDefinitionID && json.materialName == materialName && json.idCardBarcode == idCardBarcode){
+				isExist = true;
+				json.amount = (json.amount + materialAmount);
+				$(this).val(JSON.stringify(json));
+				$(this).next().next().next().text(json.amount);
+				return false;
+			}
+		}
+	});
+	
+	if(!isExist){
+		var element = '<input type="hidden" value="">';
+			element += '<dd class="tousseName">' + showName + '</dd>';
+			element += '<dd class="materialName">' + materialName + '</dd>';
+			element += '<dd class="materialNum">' + materialAmount + '</dd>';
+			element += '<dd class="delBtn"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);refreshBasketStatus();">删除</a></dd>';
+		var json = getBasketItemJSON(tousseName,materialName,materialAmount,tousseAmount,tousseDefinitionID,idCardBarcode,
+				putBasketMaxAmount,materialInstanceId,isImplant);
+		basketElement.prepend($(element));
+		basketElement.find("input:first").val(json);
+	}
+}
+
+//将器械包放入篮筐中
+function putMaterialInBasket(row,batchToBasket,thisAmount){
+	var inputSuccess = false;
+    if($('#basketsUl').children().length > 0){
+        var tousseName = $('#tousseName'+row).val();
+        var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
+        var materialName = $('#materialName'+row).val();
+        var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
+        var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
+        var loadedAmount = parseInt($('#loadedAmount'+row).val(),10);
+        var tousseAmount = parseInt($('#tousseAmount'+row).val(),10);
+        var tousseDefinitionID = $('#tousseDefinitionID'+row).val();
+        var idCardBarcode = $('#idCardBarcode'+row).val();
+        var putBasketMaxAmount = $('#putBasketMaxAmount'+row).val();
+        var washClassifyType = $('#washClassifyType'+row).val();
+        var materialInstanceId = $('#materialInstanceId'+row).val();
+        var isImplant = $('#isImplant'+row).val();
+        
+        var insertBasketAmount = thisAmount?thisAmount:(recycleAmount - loadedAmount);
+        if(insertBasketAmount <= 0){
+        	 alertDiv('放入篮筐的数量必须大于0！');
+        	return false;
+        }
+		
+        var success = addBasketItemElement(tousseName,materialName,insertBasketAmount,tousseAmount,tousseDefinitionID,idCardBarcode,
+        		putBasketMaxAmount,batchToBasket,materialInstanceId,isImplant);
+
+        if(success){
+        	$('#loadedAmount'+row).val(loadedAmount + insertBasketAmount)
+            
+            if(applicationAmount == parseInt($('#loadedAmount'+row).val(),10)){
+    	        deleteTousseItem(row);
+            }
+        	inputSuccess = true;
+        }
+    }else{
+        alertDiv('请先扫描篮筐条码。');
+    }
+    return inputSuccess;
+}
+function putMaterialInBasketWithAmount(row,amount){
+	putMaterialInBasket(row,false,amount);
+	refreshBasketStatus();
+}
+
+function deleteTousseItem(row){
+    $('#tousseItemsTr'+row).hide();
+    $('#deleted'+row).val('1');
+}
+
+function add(row){
+	var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
+	var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
+    if(recycleAmount >= applicationAmount){
+    	return;
+    }
+    $('#recycleAmount'+row).val(recycleAmount+1);
+}
+
+function reduce(row){
+    var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
+    if(recycleAmount > 0){
+        $('#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='+resolution+'&row='+row,
+         area : [width + 'px' , height + 'px'],
+         border : [5, 0.3, '#fff', true],
+         closeBtn : [2 , true],
+         offset : ['250px','']
+    });
+}
+//打开输入装载数量页面
+function openUpdateLoadAmount(obj,row){	
+	var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
+    var loadedAmount = parseInt($('#loadedAmount'+row).val(),10);
+    if(loadedAmount >= recycleAmount){
+    	alertDiv("已经都装载入筐了");
+    	return;
+    }
+    if($('#basketsUl').children().length <= 0){
+    	alertDiv('请先扫描篮筐条码。');
+    	return;
+    }
+    obj.blur();
+	var width = 550;
+    var height = 300;
+    if(resolution == '1980'){
+        width = 750;
+        height = 400;
+    }
+    layerIndex = layer.open({
+         type : 2,
+         title : ['装载入筐',true],
+         content : 'updateAmount.jsp?resolution='+resolution+'&row='+row + '&recycleAmount=' 
+         				+ recycleAmount + '&loadedAmount=' + loadedAmount + '&from=customLoadedAmount',
+         area : [width + 'px' , height + 'px'],
+         border : [5, 0.3, '#fff', true],
+         closeBtn : [2 , true],
+         offset : ['250px','']
+    });
+}
+function changeRecycleAmount(){
+	//空实现。主要是updateAmount.jsp中有调用这个方法
+}
+var layerIndex;
+function closeLayer(){
+	layer.close(layerIndex);
+	layerIndex = null;
+}
+/**
+ * 添加待回收的材料项
+ */
+function addWaitRecycleMaterialItem(row,materialItem){
+	
+	var tousseName = materialItem.tousseName;
+	var materialName = materialItem.materialName;
+	var recycleAmount = materialItem.amount;
+	var tousseDefinitionID = materialItem.tousseDefinitionID;
+	var tousseAmount = materialItem.tousseAmountForMaterial;
+	var idCardBarcode = materialItem.idCardBarcode;
+	var putBasketMaxAmount = materialItem.putBasketMaxAmount;
+	var washClassifyType = materialItem.washClassifyType;
+	var materialInstanceId = materialItem.materialInstanceId;
+	var isImplant = materialItem.isImplant;
+	
+     var trElement = $('<tr id="tousseItemsTr'+row+'"><td width="130px" style="font-size: 25px;">'+
+               '<input type="hidden" id="tousseDefinitionID'+row+'" name="tousseDefinitionID'+row+'" value="'+tousseDefinitionID+'"/>'+
+               '<input type="hidden" id="deleted'+row+'" name="deleted'+row+'" value="0"/>'+
+               '<input type="hidden" id="putBasketMaxAmount'+row+'" name="putBasketMaxAmount'+row+'" value="'+putBasketMaxAmount+'"/>' +
+               '<input type="hidden" id="tousseName'+row+'" name="tousseName'+row+'" value="'+tousseName+'"/>'+
+               '<input type="hidden" id="materialName'+row+'" name="materialName'+row+'" value="'+materialName+'"/>' +
+               '<input type="hidden" id="idCardBarcode'+row+'" name="idCardBarcode'+row+'" value="'+idCardBarcode+'"/>'+
+               '<input type="hidden" id="isImplant'+row+'" name="isImplant'+row+'" value="'+isImplant+'"/>'+
+               '<input type="hidden" id="washClassifyType'+row+'" name="washClassifyType'+row+'" value="'+washClassifyType+'"/>'+
+               '<input type="hidden" id="materialInstanceId'+row+'" name="materialInstanceId'+row+'" value="'+materialInstanceId+'"/>'+
+               '<input type="hidden" id="tousseAmount'+row+'" name="tousseAmount'+row+'" value="'+tousseAmount+'"/>' + idCardBarcode + '</td>' +
+               '<td width="250px" style="font-size: 25px;">' + tousseName + '</td>' +
+               '<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><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" value="0"/></td>'+
+               '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putMaterialInBasket('+row+',false);refreshBasketStatus();">入筐</a></td>'+
+               '</tr>');
+    $("#tousseItemTable").append(trElement);
+    return true;
+}
+
+//待装载篮筐视图中的树形菜单伸缩的处理
+function toggleItems(spanElement){
+    $(spanElement).toggleClass("minus");
+    $(spanElement).nextAll('.sed').toggle();
+}
+
+function submitCheck(){
+    var isThereRecycleAmountEmpty = false;
+    $('#tousseItemTable').children().first().children().each(function(index,element){
+        if($('#deleted'+index).val() == '0'){
+             isThereRecycleAmountEmpty = true;
+             return false;
+        }
+    });
+    if(isThereRecycleAmountEmpty){
+        alertDiv('还有物品未入筐，请全部入筐后再保存！');
+        return false;
+    }
+    return true;
+}
+
+var btSave=false;
+function doSaveAction(){
+   if(submitCheck()){
+	   var array = new Array();
+	   $("#basketsUl").children().each(function(){
+	        var id = null;
+	        var basketBarcode = null;
+	        var containerName = null;
+	        var washClassifyType = null;
+	        var classifiedItemsInfo = {};
+	        $(this).children().each(function(){
+	            if($(this).is('input') && $(this).attr('type') == 'hidden'){
+	                var baskethideStr = $(this).val();
+	                var basketJson = JSON.parse(baskethideStr);
+	               		basketBarcode = basketJson.barcode;
+	                    id = basketJson.classifyBasketId;
+	                    containerName = basketJson.containerName;
+	                    washClassifyType = basketJson.washClassifyType;
+	            }else if($(this).is('dl')){
+	                $(this).children().each(function(i,element){
+	           			 if($(this).attr('type') == 'hidden'){
+	           				 var itemJson = $(this).val();
+	           				 var json = JSON.parse(itemJson);
+	           				 var obj = {};
+		                     obj.basketBarcode = basketBarcode;
+		                     obj.containerName = containerName;
+		                     obj.washClassifyType = washClassifyType;
+		 					 obj.basketId = id;
+		 					 obj.materialName = json.materialName;
+		 					 obj.materialAmount = json.amount;
+		 					 obj.tousseName = json.tousseName;
+		 					 obj.tousseAmountForMaterial = json.tousseAmount;
+		 					 obj.tousseDefinitionID = json.tousseDefinitionID;
+		 					 obj.idCardBarcode = json.idCardBarcode;
+		 					 obj.putBasketMaxAmount = json.putBasketMaxAmount;
+		 					 var isExist = false;
+		 					 var len = array.length;
+		 					 for(var j = 0;j < len;j++){
+		 						 if(array[j].tousseDefinitionID == json.tousseDefinitionID){
+		 							isExist = true;
+		 							var materials = array[j].materials;
+		 							if(materials == null){
+		 								materials = new Array();
+		 							}
+		 							var m_len = materials.length;
+		 							var idCardIsExist = false;
+		 							for(var n = 0 ; n < m_len ; n++){
+		 								if(materials[n].idCardBarcode == json.idCardBarcode){
+		 									idCardIsExist = true;
+		 								}
+		 							}
+		 							if(!idCardIsExist){
+		 								array[j].recycleAmount = (parseInt(array[j].recycleAmount) + parseInt(json.tousseAmount));
+		 							}
+		 							materials[m_len] = obj;
+		 						 }
+		 					 }
+		 					 if(!isExist){
+		 						array[len] = {};
+		 						array[len].tousseDefinitionID = json.tousseDefinitionID;
+		 						array[len].tousseName = json.tousseName;
+		 						array[len].recycleAmount = json.tousseAmount;
+		 						array[len].idCardBarcode = json.idCardBarcode;
+		 						array[len].materials = new Array();
+		 						array[len].materials[0] = obj;
+		 					 }
+	           			}
+	                });
+	            }
+	        });
+	    });
+	   window.opener.customIntoBasketFun(array);
+	   window.close();
+	}
+}
+
+function cancel() {
+	window.close();
+}
+//一键入筐
+function allInputBasket(){
+	$('#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(amount > 0){
+        		putMaterialInBasket(row,true);
+        		//var success = putMaterialInBasket(row);
+            	//if(!success){
+            		//return false;
+            	//}
+        	}
+        }
+	});
+	refreshBasketStatus();
+	sortBasket();
+}
+/**
+ * 根据配置初始化控件
+ */
+function initConfigControl(){
+	var divElement = document.getElementById('divElement');
+	if(sstsConfig.recycleAllMaterialIntoBasket){
+		$('#allIntoBasket').css('visibility','visible');
+	}else{
+		$("#allIntoBasket").css('visibility','hidden');//元素隐藏,需要显示,否则拆分信息显示的位置会不对
+	}
+}
+function loadItem() {
+	initConfigControl();
+	$("#tousseItemTable").empty();
+    $("#basketsUl").empty();
+	document.onkeydown = showKeyDown;
+	$.ajax({
+		type : 'post',
+		url : WWWROOT + '/disinfectSystem/recyclingRecordAction!loadUnCleanedEntirelyMaterial.do?data=' + param_data,
+		dataType : 'json',
+		success : function(result) {
+			if(result && result.success){
+				if(result.tousseDefinition){
+					tousseType = result.tousseDefinition.tousseType;
+				}
+				for ( var i = 0; i < result.data.length; i++) {
+					var materialAmount = result.data[i].amount;
+
+					if(materialAmount <= 0){
+						continue;
+					}
+					addWaitRecycleMaterialItem(i,result.data[i]);
+				}
+			}
+			updateSplitInfo();
+		},
+		error : function() {
+		}
+	});
+}
+
+function encodeAll(text) {
+	var encoded = encodeURI(text);
+	encoded = encoded.replace('#', '%23');// 对#号进行转码
+	return encoded;
+}
+/**
+ * 根据篮筐的当前状态，更新拆分篮筐数
+ */
+function updateSplitInfo(){
+	if(sstsConfig.showSplitInfoInCustomIntoBasket
+			&&(tousseType==PACKAGE_TYPE_SPLIT|| tousseType==PACKAGE_TYPE_FOREIGN)){
+		$('.splitInfo').show();
+		$('#spanToolsInfo').html("工具拆分篮筐数:" + toolsSplitBasketAmount);
+		$('#spanImplantInfo').html("植入物拆分篮筐数:" + implantSplitBasketAmount);
+	}else{
+		$('.splitInfo').hide();
+	}
+}
+function sortBasket(){
+	$("#basketsUl").prepend($("#basketsUl li.otherBasket"));
+	$("#basketsUl").prepend($("#basketsUl li.containImplantBasket"));
+	$("#basketsUl").prepend($("#basketsUl li.emptyBasket"));
+}
+//工具拆分篮筐数
+var toolsSplitBasketAmount = 0;
+//植入物拆分篮筐数
+var implantSplitBasketAmount = 0;
+function refreshBasketStatus(){
+	toolsSplitBasketAmount = 0;
+	implantSplitBasketAmount = 0;
+	$("#basketsUl > li").each(function(){
+		$(this).removeClass('emptyBasket containImplantBasket otherBasket');//用于排序篮筐的css类
+  		 var count = $(this).find('dl[class="sed clearfix"]').children().length;
+  		 if(count == 0){
+  			 $(this).addClass('emptyBasket');
+  			$(this).find('div').addClass('status-empty-yellow');
+  		 }else{
+  			$(this).find('div').removeClass('status-empty-yellow');
+  		 }
+  		 if(sstsConfig.showSplitInfoInCustomIntoBasket && (tousseType==PACKAGE_TYPE_SPLIT|| tousseType==PACKAGE_TYPE_FOREIGN)){
+  			var containImplant = '否';
+  	  		 var containTools = '否';
+  	  		 //遍历是否有植入物，然后存到 li 的hidden里(存了篮筐信息的)
+  	  		 $(this).find('dl[class="sed clearfix"] > input').each(function(){
+  	  			var jsonStr = $(this).val();
+  	  			var materialInfo = JSON.parse(jsonStr);
+  	  			if(materialInfo.isImplant == '是'){
+  	  				containImplant = "是";
+  	  				$(this).next().next().addClass('status-implant-green');
+  	  			}else{
+  	  				containTools = '是';
+  	  				$(this).next().next().removeClass('status-implant-green');
+  	  			}
+  	  		 });
+  	  		 
+  	  		var el = $(this).find('.containImplant');
+  	  		 if(containImplant == '是'){
+  	  			$(this).addClass('containImplantBasket');
+  	  			implantSplitBasketAmount++;
+  	  			el.html("含有植入物");
+  	  		 }else{
+  	  			$(this).addClass('otherBasket');
+  	  			el.html("");
+  	  		 }
+  	  		 if(containTools == '是'){
+  	  			toolsSplitBasketAmount++;
+  	  		 }
+  		 }
+    });
+	updateSplitInfo();
+}
\ No newline at end of file
Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
===================================================================
diff -u -r19154 -r19703
--- forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java	(.../BasePoManagerImpl.java)	(revision 19154)
+++ forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java	(.../BasePoManagerImpl.java)	(revision 19703)
@@ -261,8 +261,11 @@
 		String hql = "from " + poName + " po where " + defaultIfEmpty(condition);
 		return objectDao.findByHql(hql);
 	}
-	
 	@Override
+	public List<T> getByHqlForUpdate(String condition){
+		return objectDao.getBySql_ForUpdate2(poName, "where " + defaultIfEmpty(condition));
+	}
+	@Override
 	@SuppressWarnings("unchecked")
 	public List<T> getByHql(String condition,int first,int maxResult,String orderFiled){
 		return objectDao.findBySql(poName, " where " + defaultIfEmpty(condition), first, maxResult, orderFiled);
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r19661 -r19703
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19661)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19703)
@@ -30,6 +30,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager;
+import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifiedItemManager;
 import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifyBasketManager;
 import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
@@ -110,6 +111,8 @@
 	private BeCleanItemManager beCleanItemManager;
 	
 	private ClassifyBasketManager classifyBasketManager;
+	
+	private ClassifiedItemManager classifiedItemManager;
 
 	private TousseDefinitionManager tousseDefinitionManager;
 
@@ -215,6 +218,10 @@
 		this.classifyBasketManager = classifyBasketManager;
 	}
 
+	public void setClassifiedItemManager(ClassifiedItemManager classifiedItemManager) {
+		this.classifiedItemManager = classifiedItemManager;
+	}
+
 	public void setTousseDefinitionManager(
 			TousseDefinitionManager tousseDefinitionManager) {
 		this.tousseDefinitionManager = tousseDefinitionManager;
@@ -772,7 +779,7 @@
 				item.setClassifyBasket(null);
 				items.remove(item);
 				if(item.getId() != null){
-					beCleanItemManager.deleteClassifiedItem(item);
+					classifiedItemManager.delete(item);
 				}
 				continue;
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/pic_bg2.jpg
===================================================================
diff -u -r18486 -r19703
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r19664 -r19703
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 19664)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 19703)
@@ -71,6 +71,8 @@
   recyclePageRecyclingUserNotNull : true,
   //自定义入筐界面,材料的一键入筐功能
   recycleAllMaterialIntoBasket:true,
+  //自定义入筐显示植入物和工具拆分篮筐数
+  showSplitInfoInCustomIntoBasket:true,
   //自定义入筐界面,是否启用按清洗分类类型入筐的功能。如果是一键入筐，并且配置为true，那就按清洗分类类型入筐。手动入筐不受此配置，都是入当前篮筐
   enableMaterialWashclasifyInCustomRecycle:true,
   //回收界面回收人是否默认是否为上一次回收的回收人,默认为false
Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
===================================================================
diff -u -r19154 -r19703
--- forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java	(.../BasePoManager.java)	(revision 19154)
+++ forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java	(.../BasePoManager.java)	(revision 19703)
@@ -201,6 +201,12 @@
 	 */
 	public List<T> getByHql(String condition);
 	/**
+	 * 根据查询条件查询满足条件的所有记录并加锁
+	 * @param condition 条件语句,如果为空,表示1=0
+	 * @return 成功返回所有满足条件的对象，否则返回空集合
+	 */
+	public List<T> getByHqlForUpdate(String condition);
+	/**
 	 * 根据查询条件及排序规则,获取指定位置开始的指定数量的记录
 	 * @param condition 条件语句,如果为空,表示1=0
 	 * @param first 第一条记录的索引