From d5aa468800ef3d7f726323dd25270975cbcd0f02 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 20 Sep 2023 14:11:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=95=86=E9=85=8D=E9=85=8D=E9=80=81=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index a80b2c0c0..adb4e12bd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/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);