Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r13338 -r13384
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 13338)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 13384)
@@ -567,13 +567,13 @@
 	checkLoadedAmount();
 }
 
-function materialIntoBasket(tousseName){
+function materialIntoBasket(params){
 	var success = true;
 	var msg = "";
 	var jsonArray = new Array();
 	var basketGroupBarcodeArray = new Array();
 	DWREngine.setAsync(false);
-	TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(tousseName,function(result){
+	TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){
 	    	var json = JSON.parse(result);
 	    	var basketGroupName = "";
 	        for (var i = 0; i < json.length; i++) {
@@ -787,7 +787,7 @@
                             		 jsonArray[0].name = td.name;
                             		 jsonArray[0].basketBarcode = item.barcode;
                                         			
-                            		 var amount = getTousseIntoBasketAmount(td.name,1,'是',jsonArray);
+                            		 var amount = getTousseIntoBasketAmount(td.id,td.name,1,'是',jsonArray);
                             		 if(amount <= 0){
                                          alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
                                          return false;
@@ -809,7 +809,8 @@
                             		 addBasketItemElement(basketItem);
                             		 addSuccess = true;
                             	 }else{
-                            		 var obj = materialIntoBasket(td.name);
+                            		 var params = "{tousseDefinitionID:" + td.id + ",tousseName:'" + td.name + "'}";
+                            		 var obj = materialIntoBasket(params);
                      	        	 var success = obj.success;
                      	        	 var jsonArray = obj.materials;
                      	        	 if(success){
@@ -822,7 +823,7 @@
                                          	dataArray[d_len].name = item.materialName;
                                          	dataArray[d_len].basketBarcode = item.basketBarcode;
                                          }
-                                         var amount = getTousseIntoBasketAmount(td.name,1,'否',dataArray);
+                                         var amount = getTousseIntoBasketAmount(td.id,td.name,1,'否',dataArray);
                                          if(amount <= 0){
                                              alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
                                              return false;
@@ -1149,9 +1150,10 @@
 	return scanedGoodsArray;
 }
 
-function getTousseIntoBasketAmount(tousseName,amount,isCleanedEntirely,jsonArray){
+function getTousseIntoBasketAmount(tousseDefinitionID,tousseName,amount,isCleanedEntirely,jsonArray){
 	var params = {};
     params.tousseName = tousseName;
+    params.tousseDefinitionID = tousseDefinitionID;
     params.tousseAmount = amount;
     params.isCleanedEntirely = isCleanedEntirely;
     var dataArray = new Array();
@@ -1267,7 +1269,7 @@
                     dataArray[0] = {};
                     dataArray[0].basketBarcode = tmpBasketBarcode;
                     dataArray[0].name = tousseName;
-                    amount = getTousseIntoBasketAmount(tousseName,amount,isCleanedEntirely,dataArray);
+                    amount = getTousseIntoBasketAmount(tousseDefinitionID,tousseName,amount,isCleanedEntirely,dataArray);
                     if(amount <= 0){
                         alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
                         return false;
@@ -1294,7 +1296,8 @@
                	
 				inputSuccess = true;
 	        }else{
-	        	var obj = materialIntoBasket(tousseName);
+	        	var params = "{tousseDefinitionID:" + tousseDefinitionID + ",tousseName:'" + tousseName + "'}";
+	        	var obj = materialIntoBasket(params);
 	        	var jsonArray = obj.materials;
 	        	if(obj.success){
 	        		//篮筐上限验证
@@ -1306,7 +1309,7 @@
                     	dataArray[d_len].name = item.materialName;
                     	dataArray[d_len].basketBarcode = item.basketBarcode;
                     }
-                    amount = getTousseIntoBasketAmount(tousseName,amount,isCleanedEntirely,dataArray);
+                    amount = getTousseIntoBasketAmount(tousseDefinitionID,tousseName,amount,isCleanedEntirely,dataArray);
                     if(amount <= 0){
                         alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
                         return false;
@@ -1893,7 +1896,7 @@
 	        	}
 	        }
 	        basketGroupBarcodeArray.sort();
-	        var amount = getTousseIntoBasketAmount(tousseName,recycleAmount,'否',dataArray);
+	        var amount = getTousseIntoBasketAmount(tousseDefinitionID,tousseName,recycleAmount,'否',dataArray);
 	        if(amount <= 0){
 	            alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
 	            return false;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r13300 -r13384
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 13300)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 13384)
@@ -485,13 +485,13 @@
     }
 }
 
-function materialIntoBasket(tousseName){
+function materialIntoBasket(params){
 	var success = true;
 	var msg = "";
 	var jsonArray = new Array();
 	var basketGroupBarcodeArray = new Array();
 	DWREngine.setAsync(false);
-	TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(tousseName,function(result){
+	TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){
 	    	var json = JSON.parse(result);
 	    	var basketGroupName = "";
 	        for (var i = 0; i < json.length; i++) {
@@ -651,7 +651,7 @@
                     dataArray[0] = {};
                     dataArray[0].basketBarcode = tmpBasketBarcode;
                     dataArray[0].name = tousseName;
-                    amount = getTousseIntoBasketAmount(tousseName,amount,isCleanedEntirely,dataArray);
+                    amount = getTousseIntoBasketAmount(tousseDefinitionID,tousseName,amount,isCleanedEntirely,dataArray);
                     if(amount <= 0){
                         alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
                         return false;
@@ -665,7 +665,8 @@
                 	   document.getElementById('showTousseName' + row).className = 'input-a-yellow3';
                 }
 	        }else{
-	        	var obj = materialIntoBasket(tousseName);
+	        	var param = "{tousseDefinitionID:" + tousseDefinitionID + ",tousseName:'" + tousseName + "'}";
+	        	var obj = materialIntoBasket(param);
 	        	var success = obj.success;
 	        	var jsonArray = obj.materials;
 	        	if(success){
@@ -678,7 +679,7 @@
                     	dataArray[d_len].name = item.materialName;
                     	dataArray[d_len].basketBarcode = item.basketBarcode;
                     }
-                    amount = getTousseIntoBasketAmount(tousseName,amount,isCleanedEntirely,dataArray);
+                    amount = getTousseIntoBasketAmount(tousseDefinitionID,tousseName,amount,isCleanedEntirely,dataArray);
                     if(amount <= 0){
                         alertDiv('该篮筐器械包数量已达到系统设定的上限数量,不能入筐。');
                         return false;
@@ -890,9 +891,10 @@
 	return scanedGoodsArray;
 }
 
-function getTousseIntoBasketAmount(tousseName,amount,isCleanedEntirely,jsonArray){
+function getTousseIntoBasketAmount(tousseDefinitionID,tousseName,amount,isCleanedEntirely,jsonArray){
 	var params = {};
     params.tousseName = tousseName;
+	params.tousseDefinitionID = tousseDefinitionID;
     params.tousseAmount = amount;
     params.isCleanedEntirely = isCleanedEntirely;
     var dataArray = new Array();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r12331 -r13384
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 13384)
@@ -24,7 +24,8 @@
     var insertText = document.createTextNode(tousseName);
     BElement.appendChild(insertText);
     document.getElementById("tousseNameID").appendChild(BElement);
-    TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(tousseName,function(result){
+    var params = "{tousseName:'" + tousseName + "'}";
+    TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){
     	 var json = JSON.parse(result);
          var dataLength = 0;
          if(json.length >= 11){
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r13382 -r13384
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 13382)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 13384)
@@ -2417,6 +2417,7 @@
 	 * @param
 	  {
 	     tousseName:'胸腔穿刺包',
+	     tousseDefinitionID:100,
 	     tousseAmount:5,
 	     isCleanedEntirely:'否',                                                                                                                                   
 	     data:[
@@ -2440,6 +2441,7 @@
 			JSONObject obj = JSONObject.fromObject(params);
 			
 			String tousseName = obj.optString("tousseName");
+			String tousseDefinitionID = obj.optString("tousseDefinitionID");
 			String isCleanedEntirely = obj.optString("isCleanedEntirely");
 			
 			Map<String, Double> percentageMap = new HashMap<String, Double>();
@@ -2492,7 +2494,10 @@
 			
 			//验证待入筐的物品是否可以入筐
 			Integer waitLoadAmount = obj.optInt("tousseAmount");
-			TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName(tousseName);
+			TousseDefinition td = tousseDefinitionManager.getTousseDefinitionById(tousseDefinitionID);
+			if(td == null){
+				td = tousseDefinitionManager.getTousseDefinitionByName(tousseName);
+			}
 			if(td != null){
 				List<MaterialInstance> ms = td.getMaterialInstances();
 				Map<MaterialDefinition, Integer> materialMap = new HashMap<MaterialDefinition, Integer>();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r13300 -r13384
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 13300)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 13384)
@@ -141,11 +141,20 @@
 	 * 获取器械包包含的材料（不含一次性）
 	 */
 	public String getTousseIncludeMaterialsWithOutDisposableGoods(
-			String tousseName) {
+			String tousseJson) {
 		JSONArray array = new JSONArray();
-		if (StringUtils.isNotBlank(tousseName)) {
-			TousseDefinition tousseDefinition = tousseDefinitionManager
-					.getTousseDefinitionByName(tousseName);
+		if (StringUtils.isNotBlank(tousseJson)) {
+			JSONObject json = JSONObject.fromObject(tousseJson);
+			TousseDefinition tousseDefinition = null;
+			String tousseId = json.optString("tousseDefinitionID");
+			String tousseName = json.optString("tousseName");
+			if (StringUtils.isNotBlank(tousseId)) {
+				tousseDefinition = tousseDefinitionManager
+						.getTousseDefinitionById(tousseId);
+			} else if (StringUtils.isNotBlank(tousseName)) {
+				tousseDefinition = tousseDefinitionManager
+						.getTousseDefinitionByName(tousseName);
+			}
 			if (tousseDefinition != null) {
 				List<MaterialInstance> list = tousseDefinition
 						.getMaterialInstances();