diff --git a/src/api/yieldReport/com_merge_roll.js b/src/api/yieldReport/com_merge_roll.js
new file mode 100644
index 0000000..6b7aaea
--- /dev/null
+++ b/src/api/yieldReport/com_merge_roll.js
@@ -0,0 +1,7 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+// 获取合并卷页面的参数
+export const getMergeRollPageData = data => createAPI('schedule/getMergeRollPageData', 'POST', data)
+
+// 执行切换卷的操作
+export const switchSfdcRoll = data => createAPI('schedule/switchSfdcRoll', 'POST', data)
diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index fb42d9c..48cf6e0 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -6,36 +6,36 @@
                label-width="80px">
         <!-- 当前卷 -->
         <el-row>
-          <el-col :span="8">
+          <el-col :span="10">
             <el-form-item class="customer-item" label="当前卷号:">
-              <el-input v-model="scheduleData.orderNo" readonly style="width: 80px;" ></el-input>
+              <el-input v-model="pageData.rollNo" readonly style="width: 100px;" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item class="customer-item" label="当前卷数量:">
-              <el-input v-model="scheduleData.partNo" readonly style="width: 80px;"></el-input>
+              <el-input v-model="pageData.rollQty" readonly style="width: 80px;"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="customer-item" label="">
             </el-form-item>
           </el-col>
         </el-row>
         <!-- 新卷 -->
         <el-row>
-          <el-col :span="8">
+          <el-col :span="10">
             <el-form-item class="customer-item" label="新卷卷号:">
-              <el-input v-model="scheduleData.seqNo" readonly style="width: 80px;"></el-input>
+              <el-input ref="newRollNo" v-model="pageData.newRollNo" style="width: 100px;"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item class="customer-item" label="新卷数量:">
-              <el-input v-model="scheduleData.orderNo" readonly style="width: 80px;" ></el-input>
+              <el-input v-model="pageData.newRollQty" style="width: 80px;" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="customer-item" label="总数量:">
-              <el-input v-model="scheduleData.partNo" readonly style="width: 80px;"></el-input>
+              <el-input v-model="pageData.totalQty" readonly style="width: 60px;"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,35 +49,58 @@
 </template>
 
 <script>
+  import {
+    getMergeRollPageData,
+  } from "@/api/yieldReport/com_merge_roll.js";
 export default {
   name: "com_merge_roll",
   data() {
     return {
       titleCon: '合并卷',
-      sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
         userName: this.$store.state.user.name,
         seqNo: '',
         orderNo: '',
+        itemNo: 0,
+        resourceId: '',
+        scheduledDate: '',
+        shiftNo: '',
         partNo: '',
+        workCenterNo: '',
+        workCenterDesc: '',
+        resourceDesc: '',
         rollNo: '',
         partDesc: '',
-        reportTime: '',
-        reportedFlag: 'N',
+        planStartTime: '',
+        planFinishTime: '',
         qtyRequiredOriginal: 0,
-        scheduledDate: '',
-        shiftNo: '',
         preItemDesc: '',
         nextItemDesc: '',
         nextItemNo: 0,
+        operatorId: '',
+        functionName: '',
         currentRollFlag: false
       },
-      currentRollOps: {
+      pageData: {
         site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        orderNo: '',
+        itemNo: '',
         seqNo: '',
         rollNo: '',
-        finishedFlag: '',
+        rollQty: 0,
+        newRollNo: '',/*参与合并的新卷号*/
+        newRollQty: 0,/*参与合并的新卷号*/
+        reportTime: '',
+        reportedFlag: 'N',
+        qtyRequiredOriginal: 0,
+        scheduledDate: '',
+        shiftNo: '',
+        preItemDesc: '',
+        nextItemDesc: '',
+        nextItemNo: 0,
+        currentRollFlag: false
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -88,10 +111,37 @@ export default {
         seqNo: '',
         showFlag: false
       },
-      dataListLoading: false,
     }
   },
   methods: {
+    //初始化页面
+    init(scheduleData, operatorData) {
+      //初始化参数
+      this.scheduleData = scheduleData;
+      //初始化操作员对象
+      this.operatorData = JSON.parse(JSON.stringify(operatorData));
+      this.pageData.reportTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
+      //设置对应的参数
+      this.pageData.orderNo = scheduleData.orderNo;
+      this.pageData.itemNo = scheduleData.orderNo;
+      this.pageData.seqNo = scheduleData.seqNo;
+      this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.operatorId = operatorData.operatorId;
+      //执行获取页面参数的功能
+      this.refreshPageData();
+      //自动获取焦点
+      this.$nextTick(() => {
+        this.$refs.newRollNo.focus();
+      });
+    },
+
+    /*刷新页面的参数*/
+    refreshPageData() {
+      getMergeRollPageData(this.pageData).then(({data}) => {
+        this.pageData.rollQty = data.row.resultQty;// 当前卷的数量
+        this.pageData.totalQty = data.row.resultQty;//总良品数量
+      });
+    },
 
     /*关闭modal*/
     closeDialog(){
@@ -99,28 +149,6 @@ export default {
     },
 
 
-
-
-
-
-
-
-
-
-
-
-    init(seqNo, operatorData) {
-      //初始化参数
-      this.scheduleData.seqNo = seqNo;
-      //初始化操作员对象
-      this.operatorData = JSON.parse(JSON.stringify(operatorData));
-      this.pageData.reportTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
-      // this.currentRollOps.seqNo = seqNo;
-      // this.currentRollOps.rollNo = rollNo;
-      //刷新当前派工单的信息
-      //this.refreshPageData();
-    },
-
   },
   created() {
     // this.factoryList()
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 617142c..577a3e4 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -167,6 +167,8 @@
                   <template slot-scope="scope">
                     <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N'" @click="replaceToolModal(scope.row)"
                     >刀模替换</a>
+                    <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'Y' && scope.row.rollNo == '*'" @click="replaceToolModal(scope.row)"
+                    >结束使用</a>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -3156,7 +3158,7 @@ export default {
       //打开合并卷的页面
       this.$nextTick(() => {
         this.showMergeFlag = true;
-        this.$refs.comMergeRoll.init(this.scheduleData.seqNo, this.operatorData)
+        this.$refs.comMergeRoll.init(this.scheduleData, this.operatorData)
       });
     },