Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
===================================================================
diff -u -r35531 -r35533
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java	(.../PrepareRecycleTousseManagerImpl.java)	(revision 35531)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java	(.../PrepareRecycleTousseManagerImpl.java)	(revision 35533)
@@ -306,7 +306,7 @@
 		for (String idStr : map.keySet()) {
 			Long tdId = Long.valueOf(idStr);
 			Long tousseItemId = tdIdToTousseItemIdMap.get(tdId);
-			List<String> scanBarcodes = map.get(tdId);
+			List<String> scanBarcodes = map.get(idStr);
 			Set<String> recyedBarcodes =  getBarcodesPreRecoveredByOtherTousseItems(scanBarcodes, tousseItemId);
 			if(CollectionUtils.isNotEmpty(recyedBarcodes)){
 				for (String recyedBarcode : recyedBarcodes) {
@@ -319,7 +319,7 @@
 		for (String idStr : map.keySet()) {
 			Long tdId = Long.valueOf(idStr);
 			Long tousseItemId = tdIdToTousseItemIdMap.get(tdId);
-			List<String> scanBarcodes = map.containsKey(tdId)?map.get(tdId):new ArrayList<String>();
+			List<String> scanBarcodes = map.get(idStr);
 			Set<String> tousseBarcodes = tousseBarcodesMap.containsKey(tousseItemId)?tousseBarcodesMap.get(tousseItemId):new HashSet<String>();
 			//要删除的条码
 			Collection<String> delBarcodes = CollectionUtils.subtract(tousseBarcodes, scanBarcodes);
@@ -329,16 +329,16 @@
 						+ " where "
 						+ SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseInstanceBarcode", delBarcodes)
 						+ " and tousseItemId="
-						+ tdId;
+						+ tousseItemId;
 				objectDao.excuteSQL(delSql);
 			}
 			//要添加的条码
-			Collection<String> addBarcodes = CollectionUtils.subtract(tousseBarcodes, scanBarcodes);
+			Collection<String> addBarcodes = CollectionUtils.subtract(scanBarcodes, tousseBarcodes);
 			if(CollectionUtils.isNotEmpty(addBarcodes)){
 				for (String addBarcode : addBarcodes) {
 					PrepareRecyleScanBarcode prepareRecyleScanBarcode = new PrepareRecyleScanBarcode();
 					prepareRecyleScanBarcode.setTousseInstanceBarcode(addBarcode);
-					prepareRecyleScanBarcode.setTousseItemId(tdId);
+					prepareRecyleScanBarcode.setTousseItemId(tousseItemId);
 					objectDao.save(prepareRecyleScanBarcode);
 				}
 			}