diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
index d31d35c1..d2f19005 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 
 import com.ruoyi.system.domain.OutsourceProcess;
+import com.ruoyi.system.domain.SysSop;
 import com.ruoyi.system.service.IOutsourceProcessService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,16 +57,44 @@ public class OutsourceProcessController extends BaseController
     /**
      * 导出委外工序列表
      */
+//    @RequiresPermissions("system:outsource_process:export")
+//    @Log(title = "委外工序", businessType = BusinessType.EXPORT)
+//    @PostMapping("/exportAll")
+//    @ResponseBody
+//    public AjaxResult exportAll(OutsourceProcess outsourceProcess)
+//    {
+//        List<OutsourceProcess> list = outsourceProcessService.selectOutsourceProcessList(outsourceProcess);
+//        ExcelUtil<OutsourceProcess> util = new ExcelUtil<OutsourceProcess>(OutsourceProcess.class);
+//        return util.exportExcel(list, "委外工序数据");
+//    }
+
     @RequiresPermissions("system:outsource_process:export")
     @Log(title = "委外工序", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    @PostMapping("/exportAll")
     @ResponseBody
-    public AjaxResult export(OutsourceProcess outsourceProcess)
+    public AjaxResult exportAll(OutsourceProcess outsourceProcess)
     {
         List<OutsourceProcess> list = outsourceProcessService.selectOutsourceProcessList(outsourceProcess);
         ExcelUtil<OutsourceProcess> util = new ExcelUtil<OutsourceProcess>(OutsourceProcess.class);
         return util.exportExcel(list, "委外工序数据");
     }
+
+
+    /**
+     * 导出委外工序列表
+     */
+    @RequiresPermissions("system:outsource_process:export")
+    @Log(title = "委外工序", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(@RequestBody String[] outsourceProcessCodes)
+    {
+        List<OutsourceProcess> list = outsourceProcessService.selectOutsourceProcessListByProcessCodes(outsourceProcessCodes);
+        ExcelUtil<OutsourceProcess> util = new ExcelUtil<OutsourceProcess>(OutsourceProcess.class);
+        return util.exportExcel(list, "委外工序数据");
+    }
+
+
     /**
      * 表格细节视图
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java
index 5a674b60..5e74e478 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java
@@ -72,7 +72,7 @@ public class OutsourceProcess extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("outsourceProcessId", getOutsourceProcessId()).append("outsourceProcessId", getOutsourceProcessId())
+            .append("outsourceProcessId", getOutsourceProcessId())
             .append("outsourceProcessCode", getOutsourceProcessCode())
             .append("outsourceProcessName", getOutsourceProcessName())
             .append("remark", getRemark())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java
index de8b202d..a5692411 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java
@@ -10,21 +10,6 @@ import java.util.List;
 public class OutsourceProcessVo extends OutsourceProcess {
     private static final long serialVersionUID = 1L;
 
-    /** 委外工序id */
-//    @Excel(name = "委外工序id")
-    private Long outsourceProcessId;
-
-    /** 委外工序ID */
-    private String outsourceProcessCode;
-
-    /** 委外工序编号 */
-    private String outsourceProcessNo;
-
-    /** 委外工序名称 */
-    private String outsourceProcessName;
-
-    private String remark;
-
     private List<Supplier> weightSupplier;
 
     private List<Supplier> quantitySupplier;
@@ -55,56 +40,4 @@ public class OutsourceProcessVo extends OutsourceProcess {
         this.areaSupplier = areaSupplier;
     }
 
-
-    @Override
-    public Long getOutsourceProcessId() {
-        return outsourceProcessId;
-    }
-
-    @Override
-    public void setOutsourceProcessId(Long outsourceProcessId) {
-        this.outsourceProcessId = outsourceProcessId;
-    }
-
-    public String getOutsourceProcessCode() {
-        return outsourceProcessCode;
-    }
-
-    public void setOutsourceProcessCode(String outsourceProcessCode) {
-        this.outsourceProcessCode = outsourceProcessCode;
-    }
-
-    public void setOutsourceProcessNo(String outsourceProcessNo)
-    {
-        this.outsourceProcessNo = outsourceProcessNo;
-    }
-
-    public String getOutsourceProcessNo()
-    {
-        return outsourceProcessNo;
-    }
-
-    public void setOutsourceProcessName(String outsourceProcessName)
-    {
-        this.outsourceProcessName = outsourceProcessName;
-    }
-
-    public String getOutsourceProcessName()
-    {
-        return outsourceProcessName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("outsourceProcessId", getOutsourceProcessId()).append("outsourceProcessId", getOutsourceProcessId())
-                .append("outsourceProcessCode", getOutsourceProcessCode())
-                .append("outsourceProcessName", getOutsourceProcessName())
-                .append("remark", getRemark())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java
index 7335f620..add2ede2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java
@@ -92,4 +92,9 @@ public interface OutsourceProcessMapper
      * @param prefix 前面的：ZCGX年月日
      */
     public String findMaxRoundCode(@Param("prefix") String prefix);
+
+    /**
+    *  根据委外工序编号数组查询委外工序
+    * */
+    List<OutsourceProcess> selectOutsourceProcessListByProcessCodes(String[] outsourceProcessCodes);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java
index c9800a11..d885bb6e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java
@@ -81,4 +81,9 @@ public interface IOutsourceProcessService
      * @return 结果
      */
     public int deleteOutsourceProcessByOutsourceProcessId(Integer outsourceProcessId);
+
+    /**
+    *  根据委外工序编号数组查询委外工序
+    * */
+    List<OutsourceProcess> selectOutsourceProcessListByProcessCodes(String[] outsourceProcessCodes);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
index 3acc2abb..bead66dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
@@ -64,17 +64,20 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
     @Override
     public List<OutsourceProcess> selectOutsourceProcessList(OutsourceProcess outsourceProcess)
     {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        Page<OutsourceProcess> processList = (Page<OutsourceProcess>)outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
-        processList.setTotal(CollectionUtils.isEmpty(processList) ? 0 : processList.getTotal());
-        processList.setPageNum(pageNum);
-        processList.setPageSize(pageSize);
-        return processList;
+
+        return outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
     }
 
 
+    /**
+    *  根据委外工序编号数组查询委外工序列表
+    * */
+    @Override
+    public List<OutsourceProcess> selectOutsourceProcessListByProcessCodes(String[] outsourceProcessCodes) {
+        List<OutsourceProcess> outsourceProcessList = outsourceProcessMapper.selectOutsourceProcessListByProcessCodes(outsourceProcessCodes);
+        return outsourceProcessList;
+    }
+
     /**
      * 自动生成委外工序编号
      *
diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
index 8e63ad1e..3fb98e96 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
@@ -62,6 +62,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where outsource_process_no = #{outsourceProcessNo}
     </select>
 
+
+    <select id="selectOutsourceProcessListByProcessCodes" parameterType="String" resultMap="OutsourceProcessResult">
+        <include refid="selectOutsourceProcessVo"/>
+        where outsource_process_code in
+        <foreach item="outsourceProcessCode" collection="array" open="(" separator="," close=")">
+            #{outsourceProcessCode}
+        </foreach>
+    </select>
+
     <insert id="insertOutsourceProcess" parameterType="OutsourceProcess" useGeneratedKeys="true" keyProperty="outsourceProcessId">
         insert into outsource_process
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -116,4 +125,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select max(substring(outsource_process_code,9)) from outsource_process WHERE outsource_process_code LIKE CONCAT(#{prefix}, '%')
     </select>
 
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
index df66bbf1..82133c12 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
@@ -41,6 +41,9 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:outsource_process:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:outsource_process:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -112,6 +115,62 @@
             };
             $.table.init(options);
         });
+
+
+        // 导出
+        function exportExcel(formId) {
+            // $.table.set();
+            var outsourceProcessCodeData = [];
+            var selections = $("#bootstrap-table").bootstrapTable("getSelections");
+            if(selections.length === 0){
+                $.modal.confirm("确定导出所有委外工序吗？", function() {
+                    var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
+                    var params = $("#bootstrap-table").bootstrapTable('getOptions');
+                    var dataParam = $("#" + currentId).serializeArray();
+                    dataParam.push({ "name": "orderByColumn", "value": params.sortName });
+                    dataParam.push({ "name": "isAsc", "value": params.sortOrder });
+                    $.modal.loading("正在导出数据，请稍后...");
+                    $.post(prefix + '/exportAll', dataParam, function(result) {
+                        if (result.code == web_status.SUCCESS) {
+                            window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
+                        } else if (result.code == web_status.WARNING) {
+                            $.modal.alertWarning(result.msg)
+                        } else {
+                            $.modal.alertError(result.msg);
+                        }
+                        $.modal.closeLoading();
+                    });
+                });
+            }else {
+                $.modal.confirm("确定导出选中的所有委外工序吗？", function () {
+                    //·拼接单号
+                    for(let i=0;i<selections.length;i++){
+                        outsourceProcessCodeData.push(selections[i].outsourceProcessCode);
+                    }
+                    var outsourceProcessCodes = JSON.stringify(outsourceProcessCodeData);
+                    // console.log(bomNos);
+                    $.modal.loading("正在导出数据，请稍后...");
+                    var config = {
+                        url: prefix + '/export',
+                        type: "post",
+                        dataType: "json",
+                        contentType: "application/json;charset=utf-8",
+                        data: outsourceProcessCodes,
+                        success: function(result) {
+                            window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
+                            $.modal.alertSuccess("导出成功！")
+                            $.modal.closeLoading();
+                        },
+                        error: function (result){
+                            $.modal.alertError(result.msg);
+                        }
+                    };
+                    $.ajax(config)
+                });
+            }
+        };
+
+
     </script>
 </body>
 </html>
\ No newline at end of file