1.商配配送单逻辑修改

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -3287,7 +3287,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					}
 					total.put(categoryName,num);
 				}
-				total.put("合计件数",totalNum);
+				map.put("合计数量",totalNum);
 
 
 
@@ -3326,7 +3326,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					Integer tn = 0;
 					Set<String> set = total.keySet();
 					for (String key:set){
-						if(!"合计件数".equals(key)){
+						if(!"合计数量".equals(key)){
 							numObj.put(key,0);
 							for (Map<String,Object> m:mapList){
 								String thirdProduct = (String)m.get("thirdProduct");
@@ -3338,7 +3338,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							}
 						}
 					}
-					numObj.put("合计数量",tn);
+					orderMap.put("合计数量",tn);
 					orderMap.put("产品明细",numObj);
 
 					//通过订单id和预约id查询对应包件的物料信息
@@ -3348,7 +3348,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					orderMap.put("到付运费",0);//todo 需要累加到totalPrice上
 					ls.add(orderMap);
 				}
-				total.put("到付费用",totalPrice);
+				total.put("到付运费",totalPrice);
 				map.put("明细",ls);
 				map.put("合计",total);
 				String popHtml =TemplateUtil.popTemplate("商配配配送单",map,html);