diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java
index 14719c2..e714975 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java
@@ -4,7 +4,9 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
+import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfo;
 import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfoService;
+import com.yxt.oms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,4 +32,10 @@ public class WarehouseInfoRest {
     public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) {
         return wmsWarehouseService.getWareHouse(createOrgSid);
     }
+
+    @ApiOperation("查询所有的仓库")
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
+        return wmsWarehouseService.listAll(query);
+    }
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java
new file mode 100644
index 0000000..786dc50
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java
@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.warehouseinfo;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:36
+ */
+@Data
+public class WarehouseInfo extends BaseEntity {
+
+    private String warehouseName;//仓库名称
+    private String warehouseCode;//仓库编码
+    private String contacts;//联系人
+    private String mob;//手机
+    private String telephone;//联系电话
+    private String manager;//主管
+    private String areaSid;//地区sid
+    private String address;//地址
+    private String longitude;//经度
+    private String latitude;//纬度
+    private String warehouseTypeKey;//仓库类型Key
+    private String warehouseTypeValue;//仓库类型value
+    private Integer usageStatus;//使用状态,0停用 1正常
+    private String squareMeter;//平方米
+    private Integer sortNo;//排序
+    private String useOrgSid;//创建组织sid
+    private String createOrgSid;//创建组织sid
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java
index 759100a..8edb8a8 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java
@@ -1,30 +1,18 @@
 package com.yxt.oms.biz.func.warehouseinfo;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo;
+import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.oms.feign.warehouse.warehouseinfo.WarehouseInfoFeign;
+import com.yxt.oms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import javax.annotation.Resource;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:40
- */
 @Service
 public class WarehouseInfoService {
 
@@ -32,8 +20,30 @@ public class WarehouseInfoService {
     @Autowired
     private WarehouseInfoFeign warehouseInfoFeign;
 
+    @Resource
+    private SysOrganizationFeign sysOrganizationFeign;
+
 
     public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(String createOrgSid) {
         return warehouseInfoFeign.getWareHouse(createOrgSid);
     }
+
+    public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WarehouseInfo> list = warehouseInfoFeign.listAll(query).getData();
+        return rb.success().setData(list);
+    }
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
index c96771f..e133b39 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
@@ -4,7 +4,9 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
+import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfo;
 import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeignFallback;
+import com.yxt.oms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -38,4 +40,8 @@ public interface WarehouseInfoFeign {
     @ApiOperation("订单选择仓库")
     @PostMapping("/getWareHouse")
     public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid);
+
+    @ApiOperation("查询所有的仓库")
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query);
 }