Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r15732 -r15791
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 15732)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 15791)
@@ -810,7 +810,11 @@
 				Map<String, Integer> map = new HashMap<String, Integer>();
 				String tousseNameStr = "";
 				for (JSONObject obj : itemJsonList) {
-					map.put(obj.optString("tousseName"), obj.optInt("amount"));
+					Integer amount = map.get(obj.optString("tousseName"));
+					if(amount == null){
+						amount = 0;
+					}
+					map.put(obj.optString("tousseName"), amount + obj.optInt("amount"));
 					if(StringUtils.isNotBlank(tousseNameStr)){
 						tousseNameStr += "#,";
 					}
@@ -823,7 +827,7 @@
 					if(CollectionUtils.isNotEmpty(stocklist)){
 						for (DepartmentStock departmentStock : stocklist) {
 							Integer recycleAmount = map.get(departmentStock.getTousseName());
-							if (recycleAmount != null) {
+							if (recycleAmount != null && recycleAmount > 0) {
 								// 修改库存(库存不能未负数)
 								Integer stockAmount = 0;
 								Integer usedAmount = null;