diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 121aa6b4..49f1048b 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -1174,9 +1174,9 @@ public class WareHouseController {
      */
     @AuthRuleAnnotation("")
     @PostMapping("/warehouse/inout/warehouseUserList")
-    public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
-        if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+    public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
         PageInfo<WarehouseUserEntity> pageInfo = new PageInfo<>(warehouseUserEntities);
@@ -1198,9 +1198,9 @@ public class WareHouseController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/warehouse/inout/warehouseBussniessTypeList")
-    public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
-        if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+    public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<WarehouseBussinessTypeEntity> warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest);
         PageInfo<WarehouseBussinessTypeEntity> pageInfo = new PageInfo<>(warehouseBussniessTypeList);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java
index af51013d..d4def8f7 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrSubInvWarehouseController.java
@@ -3,14 +3,12 @@ package com.glxp.api.admin.controller.thrsys;
 import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
-import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity;
 import com.glxp.api.admin.req.inout.DeleteRequest;
-import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest;
-import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse;
 import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
 import com.glxp.api.admin.service.thrsys.ThrSubInvWarehouseService;
 import com.glxp.api.common.enums.ResultEnum;
@@ -37,12 +35,12 @@ public class ThrSubInvWarehouseController {
 
     @GetMapping("/thirdSys/sub/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
-        List<ThrSubInvWarehouseEntity> thrInvWarehouseEntities = thrSubInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
-        PageInfo<ThrSubInvWarehouseEntity> pageInfo;
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        PageSimpleResponse<ThrSubInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        List<ThrSubInvWarehouseResponse> thrSubInvWarehouseResponses = thrSubInvWarehouseService.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest);
+        PageInfo<ThrSubInvWarehouseResponse> pageInfo;
+        pageInfo = new PageInfo<>(thrSubInvWarehouseResponses);
+        PageSimpleResponse<ThrSubInvWarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(thrInvWarehouseEntities);
+        pageSimpleResponse.setList(thrSubInvWarehouseResponses);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java
index dc9efd66..66f44ac2 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrSubInvWarehouseDao.java
@@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.thrsys;
 
 import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity;
 import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest;
+import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -29,4 +30,6 @@ public interface ThrSubInvWarehouseDao {
      */
     int countSubInvByParentInvId(String parentInvId);
 
+    List<ThrSubInvWarehouseResponse> filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java
index c5e9f8f7..c7ace91d 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java
@@ -3,8 +3,6 @@ package com.glxp.api.admin.req.inventory;
 import com.glxp.api.admin.req.ListPageRequest;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-
 /**
  * 查询仓库关联的数据请求参数
  */
@@ -12,7 +10,6 @@ import javax.validation.constraints.NotEmpty;
 public class FilterInvLinkDataRequest extends ListPageRequest {
 
     //分仓码
-    @NotEmpty(message = "请选择分仓！")
     private String code;
 
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrSubInvWarehouseResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrSubInvWarehouseResponse.java
new file mode 100644
index 00000000..0411d405
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrSubInvWarehouseResponse.java
@@ -0,0 +1,17 @@
+package com.glxp.api.admin.res.thrsys;
+
+import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity;
+import lombok.Data;
+
+/**
+ * 第三方分库接口响应数据
+ */
+@Data
+public class ThrSubInvWarehouseResponse extends ThrSubInvWarehouseEntity {
+
+    /**
+     * 父仓库名称
+     */
+    private String parentName;
+
+}
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java
index aadd1838..4acbeb37 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrSubInvWarehouseService.java
@@ -3,6 +3,7 @@ package com.glxp.api.admin.service.thrsys;
 
 import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity;
 import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest;
+import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse;
 
 import java.util.List;
 
@@ -22,4 +23,12 @@ public interface ThrSubInvWarehouseService {
 
     boolean deleteById(String id);
 
+    /**
+     * 查询第三方分库数据
+     *
+     * @param filterThrSubInvWarehouseRequest
+     * @return
+     */
+    List<ThrSubInvWarehouseResponse> filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java
index b9f878ad..9f872277 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrSubInvWarehouseServiceImpl.java
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.thrsys.ThrSubInvWarehouseDao;
 import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity;
 import com.glxp.api.admin.req.thrsys.FilterThrSubInvWarehouseRequest;
+import com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse;
 import com.glxp.api.admin.service.thrsys.ThrSubInvWarehouseService;
 import org.springframework.stereotype.Service;
 
@@ -77,4 +78,16 @@ public class ThrSubInvWarehouseServiceImpl implements ThrSubInvWarehouseService
         return thrSubInvWarehouseDao.deleteById(id);
     }
 
+    @Override
+    public List<ThrSubInvWarehouseResponse> filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
+        if (null == filterThrSubInvWarehouseRequest) {
+            return Collections.emptyList();
+        }
+        if (filterThrSubInvWarehouseRequest.getPage() != null) {
+            int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit());
+        }
+        return thrSubInvWarehouseDao.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest);
+    }
+
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
index e62384fc..4ced102e 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
@@ -382,7 +382,7 @@
         select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk
         <where>
             <if test="request.billNo != null and request.billNo != ''">
-                AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%'))
+                AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%') or t1.billNo like concat('%', #{request.billNo}, '%'))
             </if>
             <if test="request.submitStatus != null">
                 AND t2.exportStatus = #{request.submitStatus}
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml
index eb664c17..24c1bb02 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml
@@ -37,6 +37,30 @@
             parentId = (select code from thr_inv_warehouse where id = #{parentInvId})
     </select>
 
+    <select id="filterThrInvWarehouseResponse"
+            resultType="com.glxp.api.admin.res.thrsys.ThrSubInvWarehouseResponse">
+        select t1.*, t2.name as parentName from thr_inv_warehouse_sub t1
+            left join thr_inv_warehouse t2
+            on t2.code =t1.parentId
+        <where>
+            <if test="id != '' and id != null">
+                AND t1.id = #{id}
+            </if>
+            <if test="code != '' and code != null">
+                AND t1.code = #{code}
+            </if>
+            <if test="name != '' and name != null">
+                AND t1.`name` = #{name}
+            </if>
+            <if test="parentId != '' and parentId != null">
+                AND t1.parentId = #{parentId}
+            </if>
+            <if test="thirdSysFk != null">
+                and t1.thirdSysFk = #{thirdSysFk}
+            </if>
+        </where>
+    </select>
+
     <insert id="insertThrInvWarehouse" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity">
         replace