diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLabelTemplateService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLabelTemplateService.java
index 1b5f617..effa39d 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLabelTemplateService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLabelTemplateService.java
@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
 
 /**
@@ -10,4 +12,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
  * @Modify:
  **/
 public interface IMesLabelTemplateService extends IBaseMesService<MesLabelTemplate> {
+
+    ListPager queryMesLabelTemplateAndParamListByPager(MesLabelTemplate labelTemplate, Pager pager);
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateController.java
index eb82a7a..7b1c2c1 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateController.java
@@ -1,8 +1,24 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesLabelTemplateService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,4 +33,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesLabelTemplate")
 @Api(tags = "打印模板")
 public class MesLabelTemplateController extends BaseMesController<MesLabelTemplate> {
+
+    @Autowired
+    private IMesLabelTemplateService mesLabelTemplateService;
+
+    @GetMapping("/query-template-param")
+    @ApiOperation(value = "查询打印模板和明细")
+    public ResultBean queryMesLabelTemplateAndParamListByPager(MesLabelTemplate labelTemplate, Pager pager) {
+
+        try {
+            return ResultBean.success("查询成功").setListPager(mesLabelTemplateService.queryMesLabelTemplateAndParamListByPager(labelTemplate, pager));
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java
index 67b74a9..1dddc2c 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java
@@ -1,12 +1,25 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesLabelTemplateService;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
+import cn.estsh.i3plus.platform.common.util.MesPcnConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder;
+import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateParamRepository;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description : 打印模板
  * @Reference :
@@ -18,6 +31,8 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesLabelTemplateServiceImpl extends BaseMesService<MesLabelTemplate> implements IMesLabelTemplateService {
 
+    @Autowired
+    private MesLabelTemplateParamRepository mesLabelTemplateParamRDao;
     @Override
     protected void setPackQueryBean(MesLabelTemplate bean, DdlPackBean packBean) {
 
@@ -25,4 +40,27 @@ public class MesLabelTemplateServiceImpl extends BaseMesService<MesLabelTemplate
         DdlPreparedPack.getStringLikerPack(bean.getTemplateName(), "templateName", packBean);
 
     }
+
+    @Override
+    public ListPager queryMesLabelTemplateAndParamListByPager(MesLabelTemplate labelTemplate, Pager pager) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(labelTemplate.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(labelTemplate.getTemplateCode(), "templateCode", packBean);
+        pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
+
+        List<MesLabelTemplate> resultList = baseRDao.findByHqlWherePage(packBean, pager);
+        if (!CollectionUtils.isEmpty(resultList)){
+            for (MesLabelTemplate mesLabelTemplate : resultList) {
+                // 根据模板代码查询模板参数信息
+                List<MesLabelTemplateParam> templateParamList = mesLabelTemplateParamRDao.findByProperty(
+                        new String[]{"templateCode", MesPcnConstWords.IS_VALID, MesPcnConstWords.IS_DELETED, MesExtConstWords.ORGANIZE_CODE},
+                        new Object[]{mesLabelTemplate.getTemplateCode(), CommonEnumUtil.IS_VAILD.VAILD.getValue(),
+                                CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),labelTemplate.getOrganizeCode()});
+
+                if (!CollectionUtils.isEmpty(templateParamList)) {
+                    labelTemplate.setLabelTemplateParamList(templateParamList);
+                }
+            }
+        }
+        return new ListPager<>(resultList, pager);
+    }
 }