1.配送单打印数据逻辑优化

blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java

@@ -8,7 +8,7 @@ package org.springblade.common.constant.printTemplate;
  */
 public enum PrintTemplateStatusConstant {
 
-	daiqueren_1("配送任务打印模板","1"),
+	daiqueren_1("配送任务打印模板-市配","1"),
 	daiqueren_2("配载计划打印模板","2"),
 	daiqueren_3("运单票据打印模板","3"),
 	daiqueren_4("托运单模板","4"),
@@ -18,7 +18,8 @@ public enum PrintTemplateStatusConstant {
 	daiqueren_8("货位码模板","8"),
 	daiqueren_9("货架码模板","9"),
 	daiqueren_10("包件模板","10"),
-	daiqueren_11("库存品包件模板","11");
+	daiqueren_11("库存品包件模板","11"),
+	daiqueren_12("配送任务打印模板-商配","12");
 
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -346,10 +346,10 @@ public class DistributionDeliveryListController extends BladeController {
 	@PostMapping("/printBatch")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "批量打印", notes = "ids")
-	public R<PrintPreviewVO> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R<PrintPreviewVO> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids ,@ApiParam(value = "打印类型", required = true) @RequestParam Integer type) {
 
 		try {
-			PrintPreviewVO printPreviewVOS = distributionDeliveryListService.printBatch(ids);
+			PrintPreviewVO printPreviewVOS = distributionDeliveryListService.printBatch(ids,type);
 			return R.data(printPreviewVOS);
 		} catch (Exception e) {
 			throw new RuntimeException(e);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -225,5 +225,5 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param ids
 	 * @return
 	 */
-    PrintPreviewVO printBatch(String ids) throws Exception;
+    PrintPreviewVO printBatch(String ids,Integer type) throws Exception;
 }

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

@@ -64,6 +64,7 @@ import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant
 import org.springblade.common.constant.reservation.*;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.serviceConstant.ServiceConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.TemplateUtil;
@@ -3154,15 +3155,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 	@Override
-	public PrintPreviewVO printBatch(String ids) throws Exception {
+	public PrintPreviewVO printBatch(String ids,Integer type) throws Exception {
 
 
 		PrintPreviewVO printPreviewVO = new PrintPreviewVO();
-		List<Map> data = new ArrayList<>();
+
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_1.getValue());
+		BasicPrintTemplateEntity template = getPrintTemplate(type);
-		if (ObjectUtil.isEmpty(template)) {
-			throw new ServiceException("模板内容未找到");
-		}
 
 		String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl());
 		printPreviewVO.setTemplateHtml(html);
@@ -3171,8 +3169,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		String[] idArray = ids.split(",");
 		if (ObjectUtils.isNull(idArray)) {
 			throw new ServiceException("参数错误");
-
 		}
+		if(1 == type){
+			handleShiPeiData(printPreviewVO,idArray);
+		}else if(2 == type){
+			handleShangPeiData(printPreviewVO,idArray);
+		}else{
+			log.warn("###########printBatch: 未知的打印类型");
+			throw new CustomerException(403,"未知的打印类型");
+		}
+		return printPreviewVO;
+	}
+
+	private void handleShangPeiData(PrintPreviewVO printPreviewVO, String[] idArray) {
+		//TODO 商配配送单数据组装
+
+	}
+
+	private void handleShiPeiData(PrintPreviewVO printPreviewVO,String[] idArray){
+		List<Map> data = new ArrayList<>();
 
 		for (String id : idArray) {
 
@@ -3220,11 +3235,24 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 		}
+	}
 
 
-		return printPreviewVO;
+	private BasicPrintTemplateEntity getPrintTemplate(Integer type){
+		BasicPrintTemplateEntity template = null;
+		if(1 == type){
+			template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_1.getValue());
+		}else if(2 == type){
+			template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_12.getValue());
+		}
+		if (ObjectUtil.isEmpty(template)) {
+			throw new ServiceException("模板内容未找到");
+		}
+		return template;
 	}
 
+
+
 	/**
 	 * 构建预约单下面的订单信息
 	 *