diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
index 80797f99..7d188fa8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
@@ -3,6 +3,8 @@ package com.ruoyi.system.controller;
 import java.util.List;
 
 import com.ruoyi.aftersales.domain.vo.SelectShippingDeviceVO;
+import com.ruoyi.erp.domain.ErpBom;
+import com.ruoyi.erp.domain.ErpBomVo;
 import com.ruoyi.system.domain.SysSalesOrder;
 import com.ruoyi.system.domain.SysSalesShippingInformDetail;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -59,7 +61,7 @@ public class SysSalesShippingInformController extends BaseController
      */
     @RequiresPermissions("system:salesShippingInform:export")
     @Log(title = "销售出货通知", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    @PostMapping("/exportAll")
     @ResponseBody
     public AjaxResult export(SysSalesShippingInform sysSalesShippingInform)
     {
@@ -67,7 +69,19 @@ public class SysSalesShippingInformController extends BaseController
         ExcelUtil<SysSalesShippingInform> util = new ExcelUtil<SysSalesShippingInform>(SysSalesShippingInform.class);
         return util.exportExcel(list, "销售出货通知数据");
     }
-
+    /**
+     * 导出销售出货通知列表
+     */
+    @RequiresPermissions("system:salesShippingInform:export")
+    @Log(title = "销售出货通知", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(@RequestBody String[] outOrderCodes)
+    {
+        List<SysSalesShippingInform> list = sysSalesShippingInformService.getExportListByNos(outOrderCodes);
+        ExcelUtil<SysSalesShippingInform> util = new ExcelUtil<SysSalesShippingInform>(SysSalesShippingInform.class);
+        return util.exportExcel(list, "销售出货通知数据");
+    }
     /**
      * 新增销售出货通知
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java
index 6d7c74db..4dda8d99 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java
@@ -28,7 +28,8 @@ public class SysSalesShippingInform extends BaseEntity
     private String outOrderCode;
 
     /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消） */
-    @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消")
+//    @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消")
+    @Excel(name = "出库状态", dictType = "warehouse_out_status")
     private String warehouseOutStatus;
 
     /** 关联销售订单号 */
@@ -36,11 +37,13 @@ public class SysSalesShippingInform extends BaseEntity
     private String salesOrderCode;
 
     /** 出库类型（0销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料） */
-    @Excel(name = "出库类型", readConverterExp = "0=销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料")
+//    @Excel(name = "出库类型", readConverterExp = "0=销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料")
+    @Excel(name = "出库类型", dictType = "warehouse_out_type")
     private String warehouseOutType;
 
     /** 出库订单类型（0销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单） */
-    @Excel(name = "出库订单类型", readConverterExp = "0=销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单")
+//    @Excel(name = "出库订单类型", readConverterExp = "0=销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单")
+    @Excel(name = "出库订单类型", dictType = "warehouse_order_type")
     private String warehouseOrderType;
 
     /** 客户代码/id */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java
index 1118c835..7e0b9edb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesShippingInformMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.erp.domain.ErpBomVo;
 import com.ruoyi.system.domain.SysSalesShippingInform;
 
 /**
@@ -84,4 +86,12 @@ public interface SysSalesShippingInformMapper
      * @return 结果
      */
     public int restoreSysSalesShippingInformById(Long shippingInformId);
+
+    /**
+     * 查询出货单列表
+     *
+     * @param outOrderCodes 出货单
+     * @return 出货单集合
+     */
+    public List<SysSalesShippingInform> selectSalesShippingInformListbyCodes(String[] outOrderCodes);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
index 634d508c..f36f0393 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java
@@ -106,4 +106,6 @@ public interface ISysSalesShippingInformService
      *  客户验收详情
      * */
     int updateCustomerCheckGoodsDetail(SysSalesShippingInform sysSalesShippingInform);
+
+    List<SysSalesShippingInform> getExportListByNos(String[] outOrderCodes);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index ac717d43..ad06a111 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -354,4 +354,9 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
                  return  1;
     }
+
+    @Override
+    public List<SysSalesShippingInform> getExportListByNos(String[] outOrderCodes) {
+        return sysSalesShippingInformMapper.selectSalesShippingInformListbyCodes(outOrderCodes);
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
index 745b4aca..05f06874 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
@@ -206,4 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update sys_sales_shipping_inform set del_flag = '0' where shipping_inform_id = #{shippingInformId}
     </update>
 
+    <select id="selectSalesShippingInformListbyCodes" parameterType="String" resultMap="SysSalesShippingInformResult">
+        <include refid="selectSysSalesShippingInformVo"/>
+        where out_order_code in
+        <foreach item="outOrderCode" collection="array" open="(" separator="," close=")">
+            #{outOrderCode}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
index 9b7c6803..22807605 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
@@ -46,16 +46,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:salesShippingInform:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:salesShippingInform:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:salesShippingInform:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:salesShippingInform:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:salesShippingInform:export">
+                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:salesShippingInform:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -254,6 +254,60 @@
             var url = prefix +'/customerCheckGoodsDetail/' + shippingInformId;
             $.modal.open("详情",url);
         }
+
+        // 导出
+        function exportExcel(formId) {
+            // $.table.set();
+            var outOrderCodeData = [];
+            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++){
+                        outOrderCodeData.push(selections[i].outOrderCode);
+                    }
+                    var outOrderCodes = JSON.stringify(outOrderCodeData);
+                    // console.log(bomNos);
+                    $.modal.loading("正在导出数据，请稍后...");
+                    var config = {
+                        url: prefix + '/export',
+                        type: "post",
+                        dataType: "json",
+                        contentType: "application/json;charset=utf-8",
+                        data: outOrderCodes,
+                        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