Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
===================================================================
diff -u -r27464 -r27465
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java	(.../RecyclingRecordTableManager.java)	(revision 27464)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java	(.../RecyclingRecordTableManager.java)	(revision 27465)
@@ -382,7 +382,6 @@
 	 */
 	public String getTousseIntoBasketAmounts(String intoBasketInfos){
 		Map<String, ClassifyBasket> classifyBasketMap = new HashMap<String, ClassifyBasket>();
-		Set<String> queriedBarcodes = new HashSet<String>();
 		JSONArray resultArr = new JSONArray();
 		boolean autoSetIDCardBarcodeForPacking = CssdUtils.getSystemSetConfigByNameBool("autoSetIDCardBarcodeForPacking");
 		JSONArray intoBasketInfosArr = JSONUtil.toJSONArray(intoBasketInfos);
@@ -408,7 +407,7 @@
 			Long recyclingApplicationId = obj.optLong("recyclingApplicationId");
 			try {
 				result = recyclingRecordManager.recycleTousseIntoBaskets(null, tousseDefinitionId, amount, null, params,null,recyclingApplicationId,autoSetIDCardBarcodeForPacking
-						,classifyBasketMap,tdMap,invoicePlanMap,terminatedTousseItemToIpMap, queriedBarcodes);
+						,classifyBasketMap,tdMap,invoicePlanMap,terminatedTousseItemToIpMap);
 				resultArr.add(result);
 			} catch (Exception e) {
 				e.printStackTrace();
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r27464 -r27465
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 27464)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 27465)
@@ -4520,8 +4520,7 @@
 		Map<String, Double> barcodeToPercentageMap = new HashMap<String, Double>();
 		//获取已扫描的篮筐已使用的容积
 		Map<String, ClassifyBasket> classifyBasketMap = new HashMap<String, ClassifyBasket>();
-		Set<String> queriedBarcodes = new HashSet<String>();
-		getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap, queriedBarcodes);
+		getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap);
 		boolean isSecondRecycleForForeignTousse = false;
 		InvoicePlan ip = invoicePlanManager.get(recyclingApplicationId);
 		if(ip != null){
@@ -4795,7 +4794,6 @@
 		List<CustomIntoBasket> baskets = JSONUtil.fromJson(basketArray, CustomIntoBasket.class,map);
 		Map<String, Double> barcodeToPercentageMap = new HashMap<String, Double>();
 		Map<String, ClassifyBasket> classifyBasketMap = new HashMap<String, ClassifyBasket>();
-		Set<String> queriedBarcodes = new HashSet<String>();
 		//必须是getBean的方式。因为每次都要是新创建的bean。不使用new的方式，是因为内部还引用了其他的bean
 		TousseIntoBasketService tousseIntoBasketService = (TousseIntoBasketService) SpringBeanManger.getBean("tousseIntoBasketService");
 		tousseIntoBasketService.initJsonArray(tousseIntoBasketInfo);
@@ -4807,7 +4805,7 @@
 				return JSONUtil.buildJsonObject(false,"该器械包内无器械可回收！");
 			}
 			//获取已扫描的篮筐已使用的容积
-			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap, queriedBarcodes);
+			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap);
 			
 			//篮筐分类类型map
 			Map<String, List<CustomIntoBasket>> washClassifyTypeToBasketsMap = buildWashClassifyTypeMap(baskets);
@@ -4931,7 +4929,7 @@
 			data.put("materials", materials);
 		//整包清洗
 		}else{
-			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap, queriedBarcodes);
+			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap);
 			try{
 				tousseIntoBasketService.canAddThisBasketItem(baskets.get(0).getBarcode(),td,isSecondRecycleForForeignTousse);
 //				if(multiForeignTousseIntoSameBasket){}else{
@@ -5204,19 +5202,15 @@
 	 * @param barcodeMap
 	 * @param customIntoBaskets
 	 */
-	private void getBasketUsedVolume(Map<String, Double> percentageMap, List<CustomIntoBasket> customIntoBaskets, Map<String, ClassifyBasket> classifyBasketMap, Set<String> queriedBarcodes) {
+	private void getBasketUsedVolume(Map<String, Double> percentageMap, List<CustomIntoBasket> customIntoBaskets, Map<String, ClassifyBasket> classifyBasketMap) {
 		for (CustomIntoBasket customIntoBaset : customIntoBaskets) {
 			String barcode = customIntoBaset.getBarcode();
 			ClassifyBasket basket = null;
 			if(classifyBasketMap.containsKey(barcode)){
 				basket = classifyBasketMap.get(barcode);
 			}else{
-				if(!queriedBarcodes.contains(barcode)){
-					basket = classifyBasketManager.getUnWashedBasket(barcode);
-					if(basket != null){
-						classifyBasketMap.put(barcode, basket);
-					}
-				}
+				basket = classifyBasketManager.getUnWashedBasket(barcode);
+				classifyBasketMap.put(barcode, basket);
 			}
 			Double percentage = 0.00;
 			//持久化到数据库中的篮筐内物品
@@ -6181,7 +6175,7 @@
 			String params, String tousseIntoBasketInfo,
 			Long recyclingApplicationId, Boolean autoSetIDCardBarcodeForPacking, Map<String, ClassifyBasket> classifyBasketMap
 			,Map<Long, TousseDefinition> tdMap
-			,Map<Long, InvoicePlan> invoicePlanMap,Map<Long, Set<Long>> terminatedTousseItemToIpMap, Set<String> queriedBarcodes) {
+			,Map<Long, InvoicePlan> invoicePlanMap,Map<Long, Set<Long>> terminatedTousseItemToIpMap) {
 		if(!DatabaseUtil.isPoIdValid(tousseDefinitionId) || StringUtils.isBlank(params) || amount == null){
 			return JSONUtil.buildJsonObject(false, "参数错误！");
 		}
@@ -6221,7 +6215,7 @@
 				return JSONUtil.buildJsonObject(false,"该器械包内无器械可回收！");
 			}
 			//获取已扫描的篮筐已使用的容积
-			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap,queriedBarcodes);
+			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap);
 			
 			//篮筐分类类型map
 			Map<String, List<CustomIntoBasket>> washClassifyTypeToBasketsMap = buildWashClassifyTypeMap(baskets);
@@ -6322,7 +6316,7 @@
 			data.put("isCleanedEntirely", Constants.STR_NO);
 		//整包清洗
 		}else{
-			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap,queriedBarcodes);
+			getBasketUsedVolume(barcodeToPercentageMap, baskets, classifyBasketMap);
 			try{
 				tousseIntoBasketService.canAddThisBasketItem(baskets.get(0).getBarcode(),td,isSecondRecycleForForeignTousse);
 			}catch(Exception e){
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
===================================================================
diff -u -r27464 -r27465
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 27464)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 27465)
@@ -139,13 +139,12 @@
 	 * @param tdMap 包定义map
 	 * @param invoicePlanMap 申请单map
 	 * @param terminatedTousseItemToIpMap 申请单内终止的指定物品map
-	 * @param queriedBarcodes 已经查询过的篮筐条码
 	 * @return
 	 */
 	public JSONObject recycleTousseIntoBaskets(String materials, Long tousseDefinitionId, Integer amount, String idCardBarcode, 
 			String params,String tousseIntoBasketInfo,Long recyclingApplicationId, Boolean autoSetIDCardBarcodeForPacking,
 			Map<String, ClassifyBasket> classifyBasketMap, Map<Long, TousseDefinition> tdMap
-			,Map<Long, InvoicePlan> invoicePlanMap, Map<Long, Set<Long>> terminatedTousseItemToIpMap, Set<String> queriedBarcodes);
+			,Map<Long, InvoicePlan> invoicePlanMap, Map<Long, Set<Long>> terminatedTousseItemToIpMap);
 	/**
 	 * 材料入筐，按清洗分类类型及篮筐上限入筐
 	 * @param materialInstanceId 材料实例id
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
===================================================================
diff -u -r27462 -r27465
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java	(.../TousseIntoBasketService.java)	(revision 27462)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java	(.../TousseIntoBasketService.java)	(revision 27465)
@@ -296,7 +296,7 @@
 			for (String barcode : barcodes) {
 				if(!classifyBasketMap.containsKey(barcode)){
 					needQueryBarcodes.add(barcode);
-				}else{
+				}else if(classifyBasketMap.get(barcode) != null){
 					baskets.add(classifyBasketMap.get(barcode));
 				}
 			}