diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
index 0c34d5d..a6d4e96 100644
--- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
+++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
@@ -77,4 +77,10 @@ public class WarehouseInfoRest {
         List<WarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
         return rb.success().setData(wmsWarehouseAreaAllVos);
     }
+
+    @ApiOperation("订单选择仓库")
+    @PostMapping("/getWareHouse")
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) {
+        return wmsWarehouseService.getWareHouse(createOrgSid);
+    }
 }
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java
new file mode 100644
index 0000000..d456fe9
--- /dev/null
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java
@@ -0,0 +1,27 @@
+package com.yxt.warehouse.biz.warehouseinfo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/22 8:54
+ */
+@Data
+public class SmsOrderHouseInfo {
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 仓库sid
+     */
+    private String warehouseSid;
+
+
+    List<SmsOrderRock> houseRock = new ArrayList<>();
+}
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java
new file mode 100644
index 0000000..77f83d2
--- /dev/null
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java
@@ -0,0 +1,23 @@
+package com.yxt.warehouse.biz.warehouseinfo;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/22 8:54
+ */
+@Data
+public class SmsOrderRock {
+
+
+    /**
+     * 货位编码
+     */
+    private String warehouseRackCode;
+    /**
+     * 货位sid
+     */
+    private String warehouseRackSid;
+
+}
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
index d32077e..715bf69 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
@@ -23,4 +23,8 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
     @Select("select * from wms_warehouse_info")
     List<WarehouseAreaAllVo> selectAll();
     List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
+
+    List<SmsOrderHouseInfo> getWareHouse(@Param("createOrgSid") String createOrgSid);
+
+    List<SmsOrderRock> getHouseRock(@Param("warehouseSid") String warehouseSid);
 }
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
index 01b48a0..085153b 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
@@ -22,6 +22,20 @@
             s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
+    <select id="getWareHouse" resultType="com.yxt.warehouse.biz.warehouseinfo.SmsOrderHouseInfo">
+        select
+            sid as warehouseSid,
+            warehouseName
+        from warehouse_info
+        where createOrgSid =#{createOrgSid}
+    </select>
+    <select id="getHouseRock" resultType="com.yxt.warehouse.biz.warehouseinfo.SmsOrderRock">
+        select
+            sid as warehouseRackSid,
+            rackCode as warehouseRackCode
+        from warehouse_rack
+        where warehouseSid =#{warehouseSid}
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE warehouse_info
         SET isDelete=1
@@ -31,4 +45,4 @@
         </foreach>
 
     </update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
index 9199772..1feef56 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -172,4 +172,19 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     public List<WarehouseAreaAllVo> selectAll() {
         return baseMapper.selectAll();
     }
+
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(String createOrgSid) {
+       ResultBean rb = ResultBean.fireFail();
+       List<SmsOrderHouseInfo> list = baseMapper.getWareHouse(createOrgSid);
+        if (!list.isEmpty()) {
+            for (SmsOrderHouseInfo houseInfo : list) {
+                List<SmsOrderRock> houseRock = baseMapper.getHouseRock(houseInfo.getWarehouseSid());
+                if (!houseRock.isEmpty()) {
+                    houseInfo.setHouseRock(houseRock);
+                }
+            }
+            return rb.success().setData(list);
+        }
+       return rb.success();
+    }
 }