diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java
index ecb48757..3fc3550e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceStorageOrderController.java
@@ -3,12 +3,18 @@ package com.ruoyi.system.controller;
 import java.util.List;
 
 import com.ruoyi.system.domain.OutsourceStorage;
+import com.ruoyi.system.domain.Vo.ExportOutsourceRequisitionVo;
+import com.ruoyi.system.domain.Vo.OutsourceRequisitionVO;
 import com.ruoyi.system.service.IOutsourceStorageOrderService;
+import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper;
+import com.ruoyi.warehouse.service.IWarehouseStorageOrderService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -33,6 +39,9 @@ public class OutsourceStorageOrderController extends BaseController
     @Autowired
     private IOutsourceStorageOrderService outsourceStorageOrderService ;
 
+    @Autowired
+    private IWarehouseStorageOrderService storageOrderService ;
+
     @RequiresPermissions("system:storage:view")
     @GetMapping()
     public String storage()
@@ -60,11 +69,23 @@ public class OutsourceStorageOrderController extends BaseController
     @Log(title = "委外入库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder)
+    public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder, String ids)
     {
-        List<WarehouseStorageOrder> list = outsourceStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder);
-        ExcelUtil<WarehouseStorageOrder> util = new ExcelUtil<WarehouseStorageOrder>(WarehouseStorageOrder.class);
-        return util.exportExcel(list, "委外入库数据");
+
+        warehouseStorageOrder.setWarehouseOrderType("3");
+        if (StringUtils.isEmpty(ids)){
+            List<WarehouseStorageOrder> list = storageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder);
+            List<ExportWarehouseStorageOrderVo> exportWarehouseStorageOrderVos = storageOrderService.exportStorageOrderList(list);
+            ExcelUtil<ExportWarehouseStorageOrderVo> util = new ExcelUtil<ExportWarehouseStorageOrderVo>(ExportWarehouseStorageOrderVo.class);
+            return util.exportExcel(exportWarehouseStorageOrderVos, "入库单数据");
+        }else {
+            String[] storageCodes = ids.split(",");
+            List<WarehouseStorageOrder> list = storageOrderService.selectStorageOrderListByCodes(storageCodes);
+            List<ExportWarehouseStorageOrderVo> exportWarehouseStorageOrderVos = storageOrderService.exportStorageOrderList(list);
+            ExcelUtil<ExportWarehouseStorageOrderVo> util = new ExcelUtil<ExportWarehouseStorageOrderVo>(ExportWarehouseStorageOrderVo.class);
+            return util.exportExcel(exportWarehouseStorageOrderVos, "入库单数据");
+        }
+
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java
index 9a7aa496..cf1676f2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceStorageOrderService.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 
 import com.ruoyi.system.domain.OutsourceStorage;
+import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 
 import java.util.List;
@@ -63,4 +64,5 @@ public interface IOutsourceStorageOrderService
     public int deleteWarehouseStorageOrderByWarehouseStorageId(Long warehouseStorageId);
 
     OutsourceStorage selectStorageOrderByWarehouseStorageCode(String warehouseStorageCode);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java
index c714c260..cd7c79a8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceStorageOrderServiceImpl.java
@@ -12,6 +12,7 @@ import com.ruoyi.system.domain.OutsourceStorageDetail;
 import com.ruoyi.system.mapper.OutsourceOrderDetailMapper;
 import com.ruoyi.system.mapper.OutsourceStorageDetailMapper;
 import com.ruoyi.system.service.IOutsourceStorageOrderService;
+import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
 import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper;
@@ -267,4 +268,5 @@ public class OutsourceStorageOrderServiceImpl implements IOutsourceStorageOrderS
         outsourceStorage.setStorageDetailList(outsourceStorageDetails);
         return outsourceStorage;
     }
+
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html
index 43403659..332cc8a5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html
@@ -36,13 +36,6 @@
                                 <label>仓库员：</label>
                                 <input type="text" name="warehouseEmployee"/>
                             </li>
-<!--                            <li>-->
-<!--                                <label>入库部门：</label>-->
-<!--                                <select name="warehouseDeptType" th:with="type=${@dict.getType('warehouse_dept_type')}">-->
-<!--                                    <option value="">所有</option>-->
-<!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                                </select>-->
-<!--                            </li>-->
                             <li class="select-time">
                                 <label>录入时间：</label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
@@ -59,7 +52,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:storage:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:storage:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -235,6 +228,30 @@
             };
             $.table.init(options);
         });
+
+        // 导出
+        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