Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r26282 -r26284
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 26282)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 26284)
@@ -3288,9 +3288,14 @@
 			TousseDefinition td = getTousseDefinition(tousseDefinitions,appItem.getTousseDefinitionId());
 			//不装配不追溯物品
 			if (amount != 0) {
+				JSONObject MaterialsJsonForSave = recyclingContext.getMaterialsJsonForSave();//所有材料json
+				JSONObject MaterialsIdJson = null;//包定义对应的材料json
+				if(MaterialsJsonForSave != null){
+					MaterialsIdJson = MaterialsJsonForSave.optJSONObject(td.getId().toString());
+				}
 				newUnPackingTousseInstanceOrDisinfectGoodsDefinition(
 						record, application, amount, isNewAddTousse,td, appItem, 
-						recyclingBasketItem, errorDamages,basketItemJson, urgentTousseItems,appTousseItemMap,recyclingContext.getMaterialsJsonForSave().optJSONObject(td.getId().toString()));
+						recyclingBasketItem, errorDamages,basketItemJson, urgentTousseItems,appTousseItemMap,MaterialsIdJson);
 			}
 		}
 	}
@@ -3627,10 +3632,15 @@
 						item.setIsRecycling(td.getIsRecycling());
 						tousseItems.add(item);
 						//不装配不追溯物品
+						JSONObject MaterialsJsonForSave = recyclingContext.getMaterialsJsonForSave();//所有材料json
+						JSONObject MaterialsIdJson = null;//包定义对应的材料json
+						if(MaterialsJsonForSave != null){
+							MaterialsIdJson = MaterialsJsonForSave.optJSONObject(td.getId().toString());
+						}
 						newUnPackingTousseInstanceOrDisinfectGoodsDefinition(
 								record, application, recyclingAmount,
 								isNewAddTousse, td, item, json, errorDamages,
-								basketItemJson, urgentTousseItems,itemMap,recyclingContext.getMaterialsJsonForSave().optJSONObject(td.getId().toString()));
+								basketItemJson, urgentTousseItems,itemMap,MaterialsIdJson);
 					}
 					//未入筐添加的物品
 					for(Map.Entry<Long,TousseItemVo> entry : tousseDefIdTousseItemVoMap.entrySet()){
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java
===================================================================
diff -u -r26165 -r26284
--- ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java	(.../MaterialSupplementTests.java)	(revision 26165)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java	(.../MaterialSupplementTests.java)	(revision 26284)
@@ -185,7 +185,7 @@
 			totalPirce2 += (detail.getAmount() * detail.getPrice());
 		}
 		assertEquals(totalAmount2, 2);
-		assertEquals(totalPirce2, 6.4);
+		assertEquals(new Double(totalPirce2), new Double(6.4));
 	}
 	
 	/**
@@ -276,7 +276,7 @@
 			totalPirce2 += (detail.getAmount() * detail.getPrice());
 		}
 		assertEquals(totalAmount2, 2);
-		assertEquals(totalPirce2, 6.4);
+		assertEquals(new Double(totalPirce2), new Double(6.4));
 	}
 	
 	/**
@@ -357,7 +357,7 @@
 			totalPirce += (detail.getAmount() * detail.getPrice());
 		}
 		assertEquals(totalAmount, 2);
-		assertEquals(totalPirce, 5.3);
+		assertEquals(new Double(totalPirce), new Double(5.3));
 		
 		@SuppressWarnings("unchecked")
 		List<SupplementMaterialDetail> details2 = objectDao.findBySql(SupplementMaterialDetail.class.getSimpleName(),
@@ -371,7 +371,7 @@
 			totalPirce2 += (detail.getAmount() * detail.getPrice());
 		}
 		assertEquals(totalAmount2, 1);
-		assertEquals(totalPirce2, 2.8);
+		assertEquals(new Double(totalPirce2), new Double(2.8));
 		
 		@SuppressWarnings("unchecked")
 		List<SupplementMaterialDetail> details3 = objectDao.findBySql(SupplementMaterialDetail.class.getSimpleName(),
@@ -386,7 +386,7 @@
 		}
 		assertEquals(totalAmount3, 3);
 		double formartTotalPrice = new BigDecimal(totalPirce3).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
-		assertEquals(formartTotalPrice, 9.9);
+		assertEquals(new Double(formartTotalPrice), new Double(9.9));
 	}
 	
 	
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
===================================================================
diff -u -r26165 -r26284
--- ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java	(.../RecyclingErrorAndDamageTests.java)	(revision 26165)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java	(.../RecyclingErrorAndDamageTests.java)	(revision 26284)
@@ -569,7 +569,7 @@
 			totalAmount2 += detail.getAmount();
 			totalPrice2 += detail.getPrice();
 		}
-		assertEquals(totalPrice2, 6.3);
+		assertEquals(new Double(totalPrice2), new Double(6.3));
 		assertEquals(totalAmount2, 2);
 		
 		assertEquals(error_镊子.getMaterialCost(), new Double(3.15));