修改包件打印模板

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

@@ -0,0 +1,54 @@
+package org.springblade.common.constant.printTemplate;
+
+/**
+ * 预约单状态枚举
+ * 对应码表
+ * resvervation_status
+ * @author pref
+ */
+public enum PrintTemplateStatusConstant {
+
+	daiqueren_1("配送任务打印模板","1"),
+	daiqueren_2("配载计划打印模板","2"),
+	daiqueren_3("运单票据打印模板","3"),
+	daiqueren_4("托运单模板","4"),
+	daiqueren_5("备货单模板","5"),
+	daiqueren_6("包件标签补打","6"),
+	daiqueren_7("托盘码模板","7"),
+	daiqueren_8("货位码模板","8"),
+	daiqueren_9("货架码模板","9"),
+	daiqueren_10("包件模板","10");
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private PrintTemplateStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPrintTemplateEntity.java

@@ -81,6 +81,11 @@ public class BasicPrintTemplateEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "模板高度")
 	private Integer templateHeight;
+	/**
+	 * 模板开关
+	 */
+	@ApiModelProperty(value = "模板开关")
+	private Boolean knifeSwitch;
 	/**
 	 * 预留1
 	 */

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java

@@ -37,6 +37,7 @@ public interface IBasicPrintTemplateClient {
 
     String API_PREFIX = "template/client";
     String TOP = API_PREFIX + "/top";
+    String TOPPRINTTEMPLATE = API_PREFIX + "/printTemplate";
 
     /**
      * 获取打印模板信息列表
@@ -56,6 +57,14 @@ public interface IBasicPrintTemplateClient {
 	@GetMapping(TOP+"/getTemplateLink")
 	BasicPrintTemplateEntity getTemplate(@RequestParam("templateId") String templateId);
 
+	/**
+	 * 根据id获取模板信息
+	 * @param
+	 * @return
+	 */
+	@GetMapping(TOPPRINTTEMPLATE)
+	BasicPrintTemplateEntity getPrintTemplate();
+
 
 
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPrintTemplateClient.java

@@ -18,11 +18,13 @@ package com.logpm.basic.feign;
  */
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.entity.BasicTenantCodeEntity;
 import com.logpm.basic.service.IBasicPrintTemplateService;
 import com.logpm.basic.service.IBasicTenantCodeService;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -63,5 +65,13 @@ public class BasicPrintTemplateClient implements IBasicPrintTemplateClient {
 		return basicPrintTemplateEntity;
 	}
 
+	@Override
+	public BasicPrintTemplateEntity getPrintTemplate() {
+		return basicPrintTemplateService.getOne(Wrappers.<BasicPrintTemplateEntity>query().lambda()
+			.eq(BasicPrintTemplateEntity::getKnifeSwitch,true)
+			.eq(BasicPrintTemplateEntity::getTemplateType, PrintTemplateStatusConstant.daiqueren_10)
+		);
+	}
+
 
 }

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

@@ -393,9 +393,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public void getShowTemplate(Map<String, Object> params, HttpServletResponse response) throws IllegalAccessException {
-		String tenantId = AuthUtil.getTenantId();
+//		String tenantId = AuthUtil.getTenantId();
 //		String templateId = (String) params.get("templateId");
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getTemplate("1688431772497219586");
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate();
+//		BasicPrintTemplateEntity template = basicPrintTemplateClient.getTemplate("1688431772497219586");
 		String qrCode = (String) params.get("qrCode");
 		if (Func.isBlank(qrCode)){
 			log.error("参数异常：+{"+qrCode+"}");
@@ -442,8 +443,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		StringBuffer buffer = new StringBuffer();
 		//待删除文件列表
 		List<String> list= new ArrayList<>();
-		String templateId = "1688431772497219586";
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate();
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getTemplate(templateId);
 		String id = (String) params.get("id");
 		DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList( null,id);
 			Map<String,Object> map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class);