1.商配配送单逻辑修改

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

@@ -3272,6 +3272,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				List<Map<String,Object>> categoryList = distributionReservationMapper.findAllCategoryNum(reservationId);
 				//计算一个总计
 				Map<String,Object> total = new HashMap<>();
+				Map<String,Object> totalDetail = new HashMap<>();
 				Integer totalNum = 0;
 				for (Map<String,Object> m:categoryList){
 					Set<String> set = m.keySet();
@@ -3285,10 +3286,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							categoryName = (String)m.get(s);
 						}
 					}
-					total.put(categoryName,num);
+					totalDetail.put(categoryName,num);
 				}
-				map.put("合计数量",totalNum);
-
+				total.put("合计数量",totalNum);
+				total.put("产品明细",totalDetail);
 
 
 				//先查询预约单对应有哪些订单
@@ -3324,7 +3325,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					List<Map<String,Object>> mapList = distributionReservationMapper.getCategoryByStockArticleIdAndReservationId(stockArticleId,reservationId);
 					Map<String,Object> numObj = new HashMap<>();
 					Integer tn = 0;
-					Set<String> set = total.keySet();
+					Set<String> set = totalDetail.keySet();
 					for (String key:set){
 						if(!"合计数量".equals(key)){
 							numObj.put(key,0);