diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
index 842c62c6..8b4fc25a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
@@ -1,6 +1,10 @@
 package com.ruoyi.quality.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.quality.domain.QualityOrder;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -57,11 +61,21 @@ public class QualityManufacturingProcessController extends BaseController
     @Log(title = "品质管理制程工序", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(QualityManufacturingProcess qualityManufacturingProcess)
+    public AjaxResult export(QualityManufacturingProcess qualityManufacturingProcess,String ids)
     {
-        List<QualityManufacturingProcess> list = qualityManufacturingProcessService.selectQualityManufacturingProcessList(qualityManufacturingProcess);
-        ExcelUtil<QualityManufacturingProcess> util = new ExcelUtil<QualityManufacturingProcess>(QualityManufacturingProcess.class);
-        return util.exportExcel(list, "品质管理制程工序数据");
+
+        if(StringUtils.isEmpty(ids)){
+            List<QualityManufacturingProcess> list = qualityManufacturingProcessService.selectQualityManufacturingProcessList(qualityManufacturingProcess);
+
+            ExcelUtil<QualityManufacturingProcess> util = new ExcelUtil<QualityManufacturingProcess>(QualityManufacturingProcess.class);
+            return util.exportExcel(list, "品质管理制程工序数据");
+        }else{
+            String[] manufacturingProcessIds = ids.split(",");
+            List<QualityManufacturingProcess> list = qualityManufacturingProcessService.selectManufacturingProcessListByIds(manufacturingProcessIds);
+            ExcelUtil<QualityManufacturingProcess> util = new ExcelUtil<QualityManufacturingProcess>(QualityManufacturingProcess.class);
+            return util.exportExcel(list, "品质管理制程工序数据");
+        }
+
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
index cff33319..1cbde530 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
@@ -105,4 +105,9 @@ public interface QualityManufacturingProcessMapper
      * 查找与制程检验有关的制程工序通过制程工序名称
      * */
     QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName);
+
+    /**
+    *  查找与制程检验有关的制程工序通过制程工序Id
+    * */
+    List<QualityManufacturingProcess> selectManufacturingProcessListByIds(String[] manufacturingProcessIds);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
index 725dbde3..e6b0b967 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
@@ -91,4 +91,9 @@ public interface IQualityManufacturingProcessService
      * 查找与制程检验有关的制程工序通过制程工序名称
      * */
     QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName);
+
+    /**
+    *  查找与制程检验有关的制程工序通过制程工序编号
+    * */
+    List<QualityManufacturingProcess> selectManufacturingProcessListByIds(String[] manufacturingProcessIds);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
index 3e077d69..062d1b50 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
@@ -209,4 +209,14 @@ public class QualityManufacturingProcessServiceImpl implements IQualityManufactu
 
         return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByName(manufacturingProcessName);
     }
+
+
+    /**
+    *  查找与制程检验有关的制程工序通过制程工序编号
+    * */
+    @Override
+    public List<QualityManufacturingProcess> selectManufacturingProcessListByIds(String[] manufacturingProcessIds) {
+
+        return qualityManufacturingProcessMapper.selectManufacturingProcessListByIds(manufacturingProcessIds);
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
index 7e0d5d67..4f4403ce 100644
--- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
@@ -147,4 +147,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and manufacturing_process_autoid != #{manufacturingProcessAutoid}
         </if>
     </select>
+
+    <select id="selectManufacturingProcessListByIds" parameterType="String" resultMap="QualityManufacturingProcessResult">
+        <include refid="selectQualityManufacturingProcessVo"/>
+        where  manufacturing_process_id in
+        <foreach item="manufacturingProcessId" collection="array" open="(" separator="," close=")">
+            #{manufacturingProcessId}
+        </foreach>
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
index 534921ff..f7f1522e 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
@@ -49,6 +49,10 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="quality:manufacturingProcess:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="quality:manufacturingProcess:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -154,8 +158,33 @@
         // 详情页面
         function detail(manufacturingProcessAutoid){
             var url = ctx+'quality/manufacturingProcess/detail/'+manufacturingProcessAutoid;
-            $.modal.open("制程工序详情",url);
+            $.modal.openFull("制程工序详情",url);
+        }
+
+
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("warehouseStorageCode");
+            var dataParam = $("#formId").serializeArray();
+
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.confirm(tipMsg, function () {
+                $.modal.loading("正在导出数据，请稍后...");
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
         }
+
     </script>
 </body>
 </html>
\ No newline at end of file