From 0764a9508b258dda4b96932a67047d2b51b50c11 Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Wed, 1 Jul 2026 14:27:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/pallet/ErpPalletController.java     |  9 +++++++++
 .../admin/pallet/vo/ErpPalletRespVO.java      |  2 ++
 .../erp/dal/mysql/pallet/ErpPalletMapper.java |  3 +++
 .../erp/service/pallet/ErpPalletService.java  |  2 ++
 .../service/pallet/ErpPalletServiceImpl.java  |  7 +++++++
 .../mapper/pallet/ErpPalletMapper.xml         | 19 +++++++++++++++++++
 6 files changed, 42 insertions(+)
 create mode 100644 yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/pallet/ErpPalletMapper.xml

diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java
index 1e9ab1c9c..53f073510 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java
@@ -129,9 +129,18 @@ public class ErpPalletController {
         if (qrcode != null) {
             respVO.setQrcode(qrcode);
         }
+        fillTemplateJson(respVO);
+
         return respVO;
     }
 
+    private void fillTemplateJson(ErpPalletRespVO respVO) {
+        if (respVO == null) {
+            return;
+        }
+        respVO.setTemplateJson(palletService.selectPrintTemplate());
+    }
+
     private ErpPalletRespVO buildPalletRespVO(ErpPalletDO pallet, Map<Long, String> qrcodeMap) {
         ErpPalletRespVO respVO = BeanUtils.toBean(pallet, ErpPalletRespVO.class);
         fillPackagingInfo(respVO);
diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/vo/ErpPalletRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/vo/ErpPalletRespVO.java
index aa9397d55..95335de51 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/vo/ErpPalletRespVO.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/vo/ErpPalletRespVO.java
@@ -88,4 +88,6 @@ public class ErpPalletRespVO {
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
+    @Schema(description = "打印模板")
+    private String templateJson;
 }
diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/pallet/ErpPalletMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/pallet/ErpPalletMapper.java
index 9eba7f8c6..feeca1ca9 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/pallet/ErpPalletMapper.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/pallet/ErpPalletMapper.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.erp.controller.admin.pallet.vo.ErpPalletPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.pallet.ErpPalletDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -50,4 +51,6 @@ public interface ErpPalletMapper extends BaseMapperX<ErpPalletDO> {
                 .inIfPresent(ErpPalletDO::getAreaId, containsNullArea ? null : areaIds)
                 .gt(ErpPalletDO::getProductCount, BigDecimal.ZERO));
     }
+
+    String selectPrintTemplate(@Param("templateType") Integer templateType);
 }
diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletService.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletService.java
index 39cf20904..e840d4b10 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletService.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletService.java
@@ -32,4 +32,6 @@ public interface ErpPalletService {
     List<ErpPalletDO> getOccupiedPalletList(Collection<Long> productIds, Collection<Long> warehouseIds, Collection<Long> areaIds);
 
     void regenerateCode(Long id, String code) throws UnsupportedEncodingException;
+
+    String selectPrintTemplate();
 }
diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletServiceImpl.java
index d60fa60f9..095ba8440 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletServiceImpl.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/pallet/ErpPalletServiceImpl.java
@@ -39,6 +39,8 @@ import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_LOC
 @Validated
 public class ErpPalletServiceImpl implements ErpPalletService {
 
+    private static final int ERPPALLET_PRINT_TEMPLATE_TYPE = 8;
+
     @Resource
     private ErpPalletMapper palletMapper;
     @Resource
@@ -142,6 +144,11 @@ public class ErpPalletServiceImpl implements ErpPalletService {
         );
     }
 
+    @Override
+    public String selectPrintTemplate() {
+        return palletMapper.selectPrintTemplate(ERPPALLET_PRINT_TEMPLATE_TYPE);
+    }
+
     private ErpPalletDO validatePalletExists(Long id) {
         ErpPalletDO pallet = palletMapper.selectById(id);
         if (pallet == null) {
diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/pallet/ErpPalletMapper.xml b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/pallet/ErpPalletMapper.xml
new file mode 100644
index 000000000..63af8b271
--- /dev/null
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/pallet/ErpPalletMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.pallet.ErpPalletMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+    <select id="selectPrintTemplate" resultType="java.lang.String">
+        select template_json
+        from mes_print_template
+        where deleted = 0
+        and template_type = #{templateType}
+        and template_biz_type = 1
+    </select>
+</mapper>
\ No newline at end of file