Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r31188 -r31194
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 31188)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 31194)
@@ -2047,17 +2047,18 @@
 			Map<String , ApplicationGoodsVo> tousseNameToVoMap = new HashMap<String, ApplicationGoodsVo>();
 			for (Map<String , Object> map : list) {
 				String tousseName = (String)map.get("tousseName");
-				ApplicationGoodsVo vo = tousseNameToVoMap.get(tousseName);
+				String departCoding = (String)map.get("departCoding");
+				departCoding = departCoding == null ? "" : departCoding;
+				ApplicationGoodsVo vo = tousseNameToVoMap.get(tousseName + departCoding);
 				if (vo == null) {
 					vo = new ApplicationGoodsVo();
-					tousseNameToVoMap.put(tousseName, vo);
+					tousseNameToVoMap.put(tousseName + departCoding, vo);
 				}
 				String tousseType = (String)map.get("tousseType");
 				vo.setName(tousseName);
 				vo.setShowTousseName(tousseName);
 				vo.setGoodsType(tousseType);
 				vo.setDiposable((String)map.get("diposable"));
-				String departCoding = (String)map.get("departCoding");
 				vo.setDepartCoding(departCoding);
 				//待发货数量
 				vo.setCount(MathTools.add(vo.getCount(), (Number)map.get("amount")).intValue());