diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index 8b04163..ac2ac37 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -1075,5 +1075,21 @@ public class ScheduleController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * @Author LR
+     * @Description 查询合并卷页面的参数
+     * @DateTime  2022/2/17 16:20
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "getMergeRollPageData")
+    public R getMergeRollPageData(@RequestBody SearchScheduleData inData){
+        Map<String, Object> resultRow = scheduleService.getMergeRollPageData(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!")
+                .put("row", resultRow);
+    }
+
 
 }
diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
index 5e09b7b..ad28b4e 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
@@ -609,4 +609,12 @@ public interface ScheduleService {
      * @return void
      **/
     void createSplitSfdcRoll(SearchScheduleData inData);
+
+    /**
+     * @Author LR
+     * @Description 按照卷号条件查询数据
+     * @DateTime  2022/2/17 16:20
+     * @Param [inData]
+     **/
+    Map<String, Object> getMergeRollPageData(SearchScheduleData inData);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 474c65b..fa9cd25 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -2943,6 +2943,41 @@ public class ScheduleServiceImpl implements ScheduleService {
         return resultList.get(0);
     }
 
+    @Override
+    public Map<String, Object> getMergeRollPageData(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String username = inData.getOperatorId();
+        String reportDate = inData.getReportDate();
+        String reportTime = inData.getReportTime();
+        Float rollQty = inData.getRollQty();
+        //调用存储过程  获取合并卷的页面参数
+        Map<String, Object> resultMap = this.getMergeRollPageData(site, orderNo, itemNo, seqNo, rollNo);
+        return resultMap;
+    }
 
+    /**
+     * @Author LR
+     * @Description 查询合并卷的页面参数
+     * @DateTime  2022/2/17 17:20
+     * @Param [site, orderNo, itemNo, seqNo, rollNo]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    public Map<String, Object> getMergeRollPageData(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("getMergeRollPageData", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
 
 }
\ No newline at end of file