Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java
===================================================================
diff -u -r26164 -r28883
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java	(.../MaterialErrorDamageDetailManager.java)	(revision 26164)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java	(.../MaterialErrorDamageDetailManager.java)	(revision 28883)
@@ -9,6 +9,7 @@
 
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
+import com.forgon.disinfectsystem.entity.packing.PackingTask;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingItem;
 import com.forgon.tools.hibernate.BasePoManager;
 
@@ -28,9 +29,9 @@
 	public int getRecyclingDamagedAmountWithPackingTaskByParam(
 			String tousseName, String materialName);
 	
-	public void materialSupplement(String packingTaskId,String type, JSONArray itemArray, String washBasketBarcode,String wareHouseId) throws Exception;
+	public void materialSupplement(String packingTaskId,String type, JSONArray itemArray, String washBasketBarcode,String wareHouseId, List<Long> supplementMaterialDetailIdList) throws Exception;
 	
-	public void materialBatchSupplement(String type, String suppleStr,String washBasketBarcode,String warehouseId) throws Exception;
+	public void materialBatchSupplement(String type, String suppleStr,String washBasketBarcode,String warehouseId, List<Long> supplementMaterialDetailIdList) throws Exception;
 	
 	public List<RecyclingItem> getErrorDamageUnionRecyclingItems(MaterialErrorDamageDetail materialDetail);
 	/**
@@ -68,5 +69,5 @@
 	 * 器械报损补充的数据分摊到各科室(各材料按各科室月度使用量平摊、四舍五入、平摊的总数据要等于回写的总数)
 	 */
 	public void confirmShareMaterialDamageAddition() throws Exception;
-	
+	public Map<Long, String> getPackingTaskIdToErrorDamageRemarkMap(List<PackingTask> packingTaskList);
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/controller/MaterialErrorDamageController.java
===================================================================
diff -u -r26164 -r28883
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/controller/MaterialErrorDamageController.java	(.../MaterialErrorDamageController.java)	(revision 26164)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/controller/MaterialErrorDamageController.java	(.../MaterialErrorDamageController.java)	(revision 28883)
@@ -3,11 +3,13 @@
  */
 package com.forgon.disinfectsystem.materialerrordamage.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +21,7 @@
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
+import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryManager;
 import com.forgon.disinfectsystem.materialerrordamage.service.MaterialErrorDamageDetailManager;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
@@ -41,7 +44,11 @@
 	private PackingManager packingManager;
 	@Autowired
 	private ObjectDao objectDao;
-
+	/**
+	 * 回写manager
+	 */
+	@Autowired(required=false)
+	private WriteBackInventoryManager writeBackInventoryManager;
 	@RequestMapping(value = "/loadAdditionalMaterialStore")
 	public String loadAdditionalMaterialStore() {
 		String type = SpringUtils.getPraramValue("type", null);
@@ -190,18 +197,25 @@
 		String warehouseId = SpringUtils.getPraramValue("warehouseId", "");
 		try {
 			// 批量补充丢失、报损
+			List<Long> supplementMaterialDetailIdList  = new ArrayList<Long>();
 			if (StringUtils.isBlank(packingTaskId)) {
 				materialErrorDamageDetailManager.materialBatchSupplement(type,
-						suppleJson, washBasketBarcode,warehouseId);
+						suppleJson, washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
 				// 单个装配
 			} else {
 				JSONArray suppleArray = null;
 				if (StringUtils.isNotBlank(suppleJson)) {
 					suppleArray = JSONArray.fromObject(suppleJson);
 				}
 				materialErrorDamageDetailManager.materialSupplement(
-						packingTaskId, type, suppleArray, washBasketBarcode,warehouseId);
+						packingTaskId, type, suppleArray, washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
 			}
+			//如果有补充的数据则回写
+			if(CollectionUtils.isNotEmpty(supplementMaterialDetailIdList)){
+				if(writeBackInventoryManager != null){
+					writeBackInventoryManager.writeBackForSupplementMaterialDetailData(supplementMaterialDetailIdList, true);
+				}
+			}
 		} catch (Exception e) {
 			msg = e.getMessage();
 			success = false;
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml
===================================================================
diff -u -r28112 -r28883
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml	(.../HERP.xml)	(revision 28112)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml	(.../HERP.xml)	(revision 28883)
@@ -48,6 +48,7 @@
         <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.171.252/hrpdbintra" />
         <property name="user" value="hrp_gx" />
         <property name="password" value="hrp_gx_zoc" />
+        <property name="checkoutTimeout" value="10000"/>
         <!-- 北大医信测试环境 -->
         <!-- <property name="jdbcUrl" value="jdbc:oracle:thin:@//172.168.35.233/herp_test" />
         <property name="user" value="hrp_dba" />
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
===================================================================
diff -u -r26164 -r28883
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java	(.../MaterialErrorDamageAction.java)	(revision 26164)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java	(.../MaterialErrorDamageAction.java)	(revision 28883)
@@ -10,17 +10,20 @@
 import net.sf.json.JsonConfig;
 import net.sf.json.util.PropertyFilter;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
+import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryManager;
 import com.forgon.disinfectsystem.materialerrordamage.service.MaterialErrorDamageDetailManager;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
@@ -46,6 +49,12 @@
 	
 	private ExceptionHandler exceptionHandler;
 	
+	/**
+	 * 回写manager
+	 */
+	@Autowired(required=false)
+	private WriteBackInventoryManager writeBackInventoryManager;
+	
 	public void setExceptionHandler(ExceptionHandler exceptionHandler) {
 		this.exceptionHandler = exceptionHandler;
 	}
@@ -262,15 +271,22 @@
 		String warehouseId = StrutsParamUtils.getPraramValue("warehouseId", "");
 		try {
 			//批量补充丢失、报损
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
 			if(StringUtils.isBlank(packingTaskId)){
-				materialErrorDamageDetailManager.materialBatchSupplement(type, suppleJson, washBasketBarcode,warehouseId);
+				materialErrorDamageDetailManager.materialBatchSupplement(type, suppleJson, washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
 			}else{//单个装配任务
 				JSONArray suppleArray = null;
 				if(StringUtils.isNotBlank(suppleJson)){
 					suppleArray = JSONArray.fromObject(suppleJson);
 				}
-				materialErrorDamageDetailManager.materialSupplement(packingTaskId, type, suppleArray,washBasketBarcode,warehouseId);
+				materialErrorDamageDetailManager.materialSupplement(packingTaskId, type, suppleArray,washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
 			}
+			//如果有补充的数据则回写
+			if(CollectionUtils.isNotEmpty(supplementMaterialDetailIdList)){
+				if(writeBackInventoryManager != null){
+					writeBackInventoryManager.writeBackForSupplementMaterialDetailData(supplementMaterialDetailIdList, true);
+				}
+			}
 		} catch (Exception e) {
 			msg = exceptionHandler.handleException(e);
 			success = false;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java
===================================================================
diff -u -r26284 -r28883
--- ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java	(.../MaterialSupplementTests.java)	(revision 26284)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java	(.../MaterialSupplementTests.java)	(revision 28883)
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -131,7 +132,8 @@
 		array.add(obj2);
 		String exceptionMsg = "";
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
@@ -141,16 +143,17 @@
 		buildGoodsStock(md_钳子, 1, 3.2);
 		
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null);
+			List<Long> supplementMaterialDetailIdList2 = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList2);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
 		assertEquals(exceptionMsg, "Test镊子,材料总库存数量少于需要扣减的数量,不能扣减,请修改数量");
 		buildGoodsStock(md_镊子, 1, 2.8);
 		buildGoodsStock(md_钳子, 1, 3.2);
+		List<Long> supplementMaterialDetailIdList3 = new ArrayList<Long>();
+		materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList3);
 		
-		materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null);
-		
 		assertEquals(error.getAmount(), error.getAdditionalAmount());
 		assertEquals(error.getMaterialCost(), new Double(2.6));
 		assertEquals(error.getSettlementPrice(), new Double(7.8));
@@ -218,7 +221,8 @@
 		array.add(obj2);
 		String exceptionMsg = "";
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_DAMAGE, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_DAMAGE, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
@@ -228,7 +232,8 @@
 		buildGoodsStock(md_钳子, 1, 3.2);
 		
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_DAMAGE, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_DAMAGE, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
@@ -237,7 +242,8 @@
 		buildGoodsStock(md_钳子, 1, 3.2);
 		
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_DAMAGE, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_DAMAGE, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
@@ -318,7 +324,8 @@
 		
 		String exceptionMsg = "";
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
@@ -329,7 +336,8 @@
 		buildGoodsStock(md_钳子, 5, 3.3);
 		
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + packingTask.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
===================================================================
diff -u -r28498 -r28883
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 28498)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 28883)
@@ -10,11 +10,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -425,7 +427,7 @@
 	}
 	
 	@Override
-	public void materialBatchSupplement(String type, String suppleStr,String washBasketBarcode,String warehouseId) throws Exception {
+	public void materialBatchSupplement(String type, String suppleStr,String washBasketBarcode,String warehouseId,List<Long> supplementMaterialDetailIdList) throws Exception {
 		Map<String, JSONArray> taskIdToMaterialsMap = new HashMap<String, JSONArray>();
 		if (StringUtils.isNotBlank(suppleStr)) {
 			JSONArray itemArray = JSONArray.fromObject(suppleStr);
@@ -442,12 +444,12 @@
 		}
 		//丢失、报损生产数据量不大，占时可以不考虑性能问题
 		for (String taskId : taskIdToMaterialsMap.keySet()) {
-			materialSupplement(taskId, type, taskIdToMaterialsMap.get(taskId), washBasketBarcode,warehouseId);
+			materialSupplement(taskId, type, taskIdToMaterialsMap.get(taskId), washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
 		}
 	}
 
 	@Override
-	public void materialSupplement(String packingTaskId,String type, JSONArray itemArray, String washBasketBarcode,String wareHouseId)
+	public void materialSupplement(String packingTaskId,String type, JSONArray itemArray, String washBasketBarcode,String wareHouseId,List<Long> supplementMaterialDetailIdList)
 			throws Exception {
 		if(itemArray == null){
 			throw new SystemException("补充物品为空！");
@@ -481,8 +483,6 @@
 			List<GoodsStock> goodsStockList = goodsStockManager.saveOrUpdateGoodsStock(stockList,
 					GoodsStockManager.MODE_OUTSTOCK);
 			if(CollectionUtils.isNotEmpty(goodsStockList)){
-				//补充记录的id
-				List<Long> supplementMaterialDetailIdList = null;
 				//关联清洗篮筐
 				ClassifyBasket classifyBasket = classifyBasketManager.getClassifyBasket(washBasketBarcode);
 				for (GoodsStock goodsStock : goodsStockList) {
@@ -535,9 +535,6 @@
 							objectDao.saveOrUpdate(detail);
 							
 							if(PackingTask.TYPE_LOST.equals(type)){
-								if(supplementMaterialDetailIdList == null){
-									supplementMaterialDetailIdList = new ArrayList<Long>();
-								}
 								supplementMaterialDetailIdList.add(detail.getId());
 							}
 							
@@ -578,12 +575,6 @@
 				if(classifyBasket != null){
 					classifyBasketManager.save(classifyBasket);
 				}
-				//如果有补充的数据则回写
-				if(CollectionUtils.isNotEmpty(supplementMaterialDetailIdList)){
-					if(writeBackInventoryManager != null){
-						writeBackInventoryManager.writeBackForSupplementMaterialDetailData(supplementMaterialDetailIdList, true);
-					}
-				}
 			}
 			// 检查材料是否都补充完
 			if(packingTask != null){
@@ -868,4 +859,91 @@
 		String sql = String.format("select po.errorDamageDetails from %s po where %s",RecyclingItem.class.getSimpleName(),invoiceIdSql);
 		return objectDao.findByHql(sql);
 	}
+	@Override
+	public Map<Long, String> getPackingTaskIdToErrorDamageRemarkMap(
+			List<PackingTask> packingTaskList) {
+		Collection<Long> packingTaskIds = packingTaskList.stream().map(ti->ti.getId()).collect(Collectors.toList());
+		ResultSet rs = null;
+		Map<Long, String> packingTaskIdToErrorDamageRemarkMap = new HashMap<Long, String>();
+		try {
+			String sql = String.format("select sum(med.amount) amount,pt.id,med.type,md.name,md.unit,md.specification from PackingTask pt "
+					+ "join MaterialErrorDamageDetail med on med.packingTaskId=packingTaskId "
+					+ "join MaterialDefinition md on md.id=med.materialDefinitionId "
+					+ "where %s and (med.status is null or med.status<>1) "
+					+ "group by pt.id,med.type,md.name,md.unit,md.specification ", 
+					SqlUtils.getNonStringFieldInLargeCollectionsPredicate("pt.id", packingTaskIds));
+			rs = objectDao.executeSql(sql);
+			Map<Long, Map<String, String>> resultMap = new HashMap<Long, Map<String, String>>();
+			while(rs.next()){
+				Number amount = (Number)rs.getObject("amount");
+				if(amount == null){
+					continue;
+				}
+				Number idNum = (Number)rs.getObject("id");
+				if(idNum == null){
+					continue;
+				}
+				Long id = idNum.longValue();
+				String type = rs.getString("type");
+				String materialName = rs.getString("name");
+				String unit = rs.getString("unit");
+				if(unit == null){
+					unit = "";
+				}
+				String specification = rs.getString("specification");
+				if(StringUtils.isNotBlank(specification)){
+					materialName += "[" + specification + "]";;
+				}
+				Map<String, String> msgMap = null;
+				if(resultMap.containsKey(id)){
+					msgMap = resultMap.get(id);
+				}else{
+					msgMap = new HashMap<String, String>();
+					resultMap.put(id, msgMap);
+				}
+				if(MaterialErrorDamageDetail.TYPE_ERROR.equals(type)){
+					String errorMsg = msgMap.get(type);
+					if(errorMsg == null){
+						errorMsg = "丢失：" + materialName + "x" + amount.intValue() + unit;
+					}else{
+						errorMsg += "," + materialName + "x" + amount.intValue() + unit;
+					}
+					msgMap.put(type, errorMsg);
+				}else if(MaterialErrorDamageDetail.TYPE_DAMAGE.equals(type)){
+					String damageMsg = msgMap.get(type);
+					if(damageMsg == null){
+						damageMsg = "报损：" + materialName + "x" + amount.intValue() + unit;
+					} else {
+						damageMsg = "," + materialName + "x" + amount.intValue() + unit;
+					}
+					msgMap.put(type, damageMsg);
+				}
+			}
+			if(MapUtils.isNotEmpty(resultMap)){
+				for (Entry<Long, Map<String, String>> entry : resultMap.entrySet()) {
+					Long packingTaskId = entry.getKey();
+					Map<String, String> msgMap = entry.getValue();
+					String errorMsg = msgMap.get(MaterialErrorDamageDetail.TYPE_ERROR);
+					String damageMsg = msgMap.get(MaterialErrorDamageDetail.TYPE_DAMAGE);
+					String msg = "";
+					if(StringUtils.isNotBlank(errorMsg)){
+						msg += errorMsg + "；";
+					}
+					if(StringUtils.isNotBlank(damageMsg)){
+						msg += damageMsg + "；";
+					}
+					if(msg.endsWith("；")){
+						msg = msg.substring(0, msg.length()-1);
+						msg += "。";
+					}
+					packingTaskIdToErrorDamageRemarkMap.put(packingTaskId, msg);
+				}
+			}	
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return null;
+	}
 }
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
===================================================================
diff -u -r26284 -r28883
--- ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java	(.../RecyclingErrorAndDamageTests.java)	(revision 26284)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java	(.../RecyclingErrorAndDamageTests.java)	(revision 28883)
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -227,8 +228,8 @@
 		array.add(obj);
 		
 		GoodsStock stock_镊子 = buildGoodsStock(md_镊子, 5, 3.8);
-
-		materialErrorDamageDetailManager.materialSupplement("" + task_开胸包.getId(), PackingTask.TYPE_LOST, array, "",null);
+		List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+		materialErrorDamageDetailManager.materialSupplement("" + task_开胸包.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 		Exception exception = null;
 		try{
 			//将回收数量由2改成3
@@ -313,8 +314,8 @@
 		obj.put("materialDefinitionId", md_镊子.getId());
 		array.add(obj);
 		GoodsStock stock_镊子 = buildGoodsStock(md_镊子, 5, 3.8);
-		
-		materialErrorDamageDetailManager.materialSupplement("" + task_开胸包.getId(), PackingTask.TYPE_LOST, array, "",null);
+		List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+		materialErrorDamageDetailManager.materialSupplement("" + task_开胸包.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 	
 		//装配
 		packingManager.delete(task_开胸包, "");
@@ -419,7 +420,8 @@
 
 		String exceptionMsg = "";
 		try {
-			materialErrorDamageDetailManager.materialSupplement("" + task_开胸包.getId(), PackingTask.TYPE_LOST, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("" + task_开胸包.getId(), PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			e.printStackTrace();
 			exceptionMsg = e.getMessage();
@@ -464,7 +466,8 @@
 		GoodsStock stock_镊子 = buildGoodsStock(md_镊子, 5, 3.8);
 		String exceptionMsg = "";
 		try {
-			materialErrorDamageDetailManager.materialSupplement("", PackingTask.TYPE_DAMAGE, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("", PackingTask.TYPE_DAMAGE, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			e.printStackTrace();
 			exceptionMsg = e.getMessage();
@@ -533,7 +536,8 @@
 		array.add(obj);
 		String exceptionMsg = "";
 		try {
-			materialErrorDamageDetailManager.materialSupplement("", PackingTask.TYPE_LOST, array, "",null);
+			List<Long> supplementMaterialDetailIdList = new ArrayList<Long>();
+			materialErrorDamageDetailManager.materialSupplement("", PackingTask.TYPE_LOST, array, "",null,supplementMaterialDetailIdList);
 		} catch (Exception e) {
 			exceptionMsg = e.getMessage();
 		}