diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
index c7af0ff0..f49e6ae1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
@@ -4,15 +4,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.OutsourcePlan;
 import com.ruoyi.system.domain.OutsourcePlanDetail;
+import com.ruoyi.warehouse.domain.VO.ExportWarehouseStorageOrderVo;
+import com.ruoyi.warehouse.domain.WarehouseInventoryCheckDetail;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
 import com.ruoyi.warehouse.service.IWarehouseStorageOrderDetailService;
 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;
@@ -68,13 +70,26 @@ public class WarehouseStorageOrderController extends BaseController
     @Log(title = "仓库入库单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder)
-    {
-        List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder);
-        ExcelUtil<WarehouseStorageOrder> util = new ExcelUtil<WarehouseStorageOrder>(WarehouseStorageOrder.class);
-        return util.exportExcel(list, "仓库入库单数据");
+    public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder, String ids)
+    {
+        if (StringUtils.isEmpty(ids)){
+            List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder);
+            List<ExportWarehouseStorageOrderVo> exportWarehouseStorageOrderVos = warehouseStorageOrderService.exportStorageOrderList(list);
+            ExcelUtil<ExportWarehouseStorageOrderVo> util = new ExcelUtil<ExportWarehouseStorageOrderVo>(ExportWarehouseStorageOrderVo.class);
+            return util.exportExcel(exportWarehouseStorageOrderVos, "仓库入库单数据");
+        }else {
+            String[] checkCodes = ids.split(",");
+            List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectStorageOrderListByCodes(checkCodes);
+            List<ExportWarehouseStorageOrderVo> exportWarehouseStorageOrderVos = warehouseStorageOrderService.exportStorageOrderList(list);
+            ExcelUtil<ExportWarehouseStorageOrderVo> util = new ExcelUtil<ExportWarehouseStorageOrderVo>(ExportWarehouseStorageOrderVo.class);
+            return util.exportExcel(exportWarehouseStorageOrderVos, "仓库入库单数据");
+        }
+
+
     }
 
+
+
     /**
      * 新增仓库入库单
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java
index 2f81e90f..46165268 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/ExportWarehouseStorageOrderVo.java
@@ -331,33 +331,4 @@ public class ExportWarehouseStorageOrderVo {
     @Excel(name = "生产入库数")
     private Integer makeStorageNum;
 
-    /**
-     * 客户ID
-     */
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    /**
-     * 客户名称
-     */
-    @Excel(name = "客户名称")
-    private String customerName;
-
-    /**
-     * 客户联系人
-     */
-    @Excel(name = "客户联系人")
-    private String customerContactPeople;
-
-    /**
-     * 客户联系人电话
-     */
-    @Excel(name = "客户联系人电话")
-    private String customerContactNumber;
-
-    /**
-     * 客户公司地址
-     */
-    @Excel(name = "客户公司地址")
-    private String customerCompanyAddress;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
index 52152a5e..c3165eba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
@@ -2247,11 +2247,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             exportVo.setTemporaryRemark(detail.getTemporaryRemark());
             exportVo.setStorageLocation(detail.getStorageLocation());
             exportVo.setMakeStorageNum(detail.getMakeStorageNum());
-            exportVo.setCustomerId(detail.getCustomerId());
-            exportVo.setCustomerName(detail.getCustomerName());
-            exportVo.setCustomerContactPeople(detail.getCustomerContactPeople());
-            exportVo.setCustomerContactNumber(detail.getCustomerContactNumber());
-            exportVo.setCustomerCompanyAddress(detail.getCustomerCompanyAddress());
+//            exportVo.setCustomerId(detail.getCustomerId());
+//            exportVo.setCustomerName(detail.getCustomerName());
+//            exportVo.setCustomerContactPeople(detail.getCustomerContactPeople());
+//            exportVo.setCustomerContactNumber(detail.getCustomerContactNumber());
+//            exportVo.setCustomerCompanyAddress(detail.getCustomerCompanyAddress());
 
             // 从WarehouseStorageOrder填充数据，通过入库单号进行关联
             WarehouseStorageOrder order = warehouseStorageOrderMap.get(detail.getWarehouseStorageCode());
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
index 0344f76f..b12b4eb7 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
@@ -74,7 +74,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:storageOrder:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="warehouse:storageOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -569,6 +569,31 @@
             var url = ctx + 'warehouse/storageOrder/storageReturnOrderDetail/' + warehouseStorageId;
             $.modal.open("详情",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