Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r28972 -r28991
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 28972)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 28991)
@@ -3113,7 +3113,7 @@
 		ResultSet rs = null;
 		String msg = "";
 		try {
-			String sql = String.format("select sum(med.amount) amount,med.type,md.name,md.unit,md.specification from PackingTask pt "
+			String sql = String.format("select sum(med.amount - additionalAmount) amount,med.type,md.name,md.unit,md.specification from PackingTask pt "
 					+ "join MaterialErrorDamageDetail med on med.packingTaskId=pt.id "
 					+ "join MaterialDefinition md on md.id=med.materialDefinitionId "
 					+ "where %s and (med.status is null or med.status<>1) "
@@ -3124,7 +3124,7 @@
 			String damageMsg = null;
 			while(rs.next()){
 				Number amount = (Number)rs.getObject("amount");
-				if(amount == null){
+				if(amount == null || amount.intValue() == 0){
 					continue;
 				}
 				String type = rs.getString("type");
@@ -8019,7 +8019,7 @@
 		Map<Long, JSONObject> packingTaskIdToErrorDamageRemarkMap = new HashMap<Long, JSONObject>();
 		Map<Long, Map<String, String>> resultMap = new HashMap<Long, Map<String, String>>();
 		try {
-			String sql = String.format("select sum(med.amount) amount,pt.id,med.type,md.name,md.unit,md.specification from PackingTask pt "
+			String sql = String.format("select sum(med.amount - additionalAmount) amount,pt.id,med.type,md.name,md.unit,md.specification from PackingTask pt "
 					+ "join MaterialErrorDamageDetail med on med.packingTaskId=pt.id "
 					+ "join MaterialDefinition md on md.id=med.materialDefinitionId "
 					+ "where %s and (med.status is null or med.status<>1) "
@@ -8029,7 +8029,7 @@
 			
 			while(rs.next()){
 				Number amount = (Number)rs.getObject("amount");
-				if(amount == null){
+				if(amount == null || amount.intValue() == 0){
 					continue;
 				}
 				Number idNum = (Number)rs.getObject("id");