Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r14011 -r14418
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 14011)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 14418)
@@ -247,6 +247,10 @@
     										}else if(result.returnType == 'barcodeNotFound'){
     											showResult('未能查询到该条码相关信息。');
     											top.Ext.getCmp("scanBarcode").setValue('');
+    										}else if(result.returnType == ''){
+    											showResult(result.message);
+    										}else{
+    											showResult('未能查询到该条码相关信息。');
     										}
     									}else{
     										showResult('未能查询到该条码相关信息。');
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r14407 -r14418
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 14407)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 14418)
@@ -1741,11 +1741,11 @@
 			if(!TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tousseDefinition.getTousseType())
 					&& !TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tousseDefinition.getTousseType())){
 				tousse.setStatus(TousseInstance.STATUS_RECYCLED);
-				if(tousseMap.get(tousse.getTousseName()) != null){
-					Integer amount = tousseMap.get(tousse.getTousseName());
-					tousseMap.put(tousse.getTousseName(), amount+1);
+				if(tousseMap.get(tousseDefinition.getId() + "_" + tousse.getTousseName()) != null){
+					Integer amount = tousseMap.get(tousseDefinition.getId() + "_" + tousse.getTousseName());
+					tousseMap.put(tousseDefinition.getId() + "_" + tousse.getTousseName(), amount+1);
 				}else{
-					tousseMap.put(tousse.getTousseName(), 1);
+					tousseMap.put(tousseDefinition.getId() + "_" + tousse.getTousseName(), 1);
 				}
 			}
 		}
@@ -1762,11 +1762,14 @@
 		}
 		while(iterator.hasNext()){
 			Entry<String, Integer> entry = iterator.next();
-			String tousseName = entry.getKey();
+			String tousseIdAndName = entry.getKey();
+			String tousseDefinitionId = tousseIdAndName.split("_")[0];
+			String tousseName = tousseIdAndName.split("_")[1];
 			Integer amount = entry.getValue();
 			JSONObject json = new JSONObject();
 			json.put("basketBarcode",basketBarcode);
 			json.put("basketId", basketId);
+			json.put("tousseDefinitionID", tousseDefinitionId);
 			json.put("tousseName", tousseName);
 			json.put("amount", amount);
 			json.put("itemType", "器械包");