调拨管理可以根据总仓，仓库，网点的三级结构获取仓管管理中的仓库数据

src/main/java/com/boco/nbd/wios/manage/entity/bo/Warehouse.java

@@ -51,6 +51,7 @@ public class Warehouse extends CoreEntity {
     @ApiModelProperty(value = "仓库归属名称")
     @ApiModelProperty(value = "仓库归属名称")
     private String warehouseAttributionName;
     private String warehouseAttributionName;
 
 
+
     public String getId() {
     public String getId() {
         return id;
         return id;
     }
     }

src/main/java/com/boco/nbd/wios/manage/entity/bo/WarehouseEx.java

@@ -7,6 +7,8 @@
  */
  */
 package com.boco.nbd.wios.manage.entity.bo;
 package com.boco.nbd.wios.manage.entity.bo;
 
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
 /**
  * Description
  * Description
  * @author lvpeng
  * @author lvpeng
@@ -21,6 +23,18 @@ public class WarehouseEx extends Warehouse {
     private String pathName;
     private String pathName;
     private String serviceProviderName;
     private String serviceProviderName;
     private String superiorWarehouseName;
     private String superiorWarehouseName;
+    @ApiModelProperty(value = "仓库归属名称")
+    private String warehouseAttributionName;
+
+    @Override
+    public String getWarehouseAttributionName() {
+        return warehouseAttributionName;
+    }
+
+    @Override
+    public void setWarehouseAttributionName(String warehouseAttributionName) {
+        this.warehouseAttributionName = warehouseAttributionName;
+    }
 
 
     public Integer getParentId() {
     public Integer getParentId() {
         return parentId;
         return parentId;

src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseQuery.java

@@ -49,6 +49,8 @@ public class WarehouseQuery {
     private Integer pagecount;
     private Integer pagecount;
     @ApiModelProperty("是否分页，1是分页,2是不分页")
     @ApiModelProperty("是否分页，1是分页,2是不分页")
     private Integer isWarehousePage;
     private Integer isWarehousePage;
+    @ApiModelProperty(value = "上级仓库ID")
+    private String superiorWarehouseId;
 
 
     public String getId() {
     public String getId() {
         return id;
         return id;
@@ -145,4 +147,12 @@ public class WarehouseQuery {
     public void setIsWarehousePage(Integer isWarehousePage) {
     public void setIsWarehousePage(Integer isWarehousePage) {
         this.isWarehousePage = isWarehousePage;
         this.isWarehousePage = isWarehousePage;
     }
     }
+
+    public String getSuperiorWarehouseId() {
+        return superiorWarehouseId;
+    }
+
+    public void setSuperiorWarehouseId(String superiorWarehouseId) {
+        this.superiorWarehouseId = superiorWarehouseId;
+    }
 }
 }

src/main/java/com/boco/nbd/wios/manage/mapper/extdb/WarehouseMapperEx.java

@@ -81,7 +81,7 @@ public interface WarehouseMapperEx {
      * @param createAccount
      * @param createAccount
      * @return
      * @return
      */
      */
-    List<WarehouseEx> qryWarehouseList(@Param("id") String id, @Param("appkey") String appkey, @Param("warehouseLevenId")String warehouseLevenId, @Param("name")String name, @Param("isEnable")Integer isEnable, @Param("serviceProviders")List<String> serviceProviders, @Param("area")String area, @Param("warehouseAttribution")String warehouseAttribution,@Param("createAccount")String createAccount);
+    List<WarehouseEx> qryWarehouseList(@Param("id") String id, @Param("appkey") String appkey, @Param("warehouseLevenId")String warehouseLevenId, @Param("name")String name, @Param("isEnable")Integer isEnable, @Param("serviceProviders")List<String> serviceProviders, @Param("area")String area, @Param("warehouseAttribution")String warehouseAttribution,@Param("createAccount")String createAccount,@Param("superiorWarehouseId")String superiorWarehouseId);
 
 
 
 
     /**
     /**

src/main/java/com/boco/nbd/wios/manage/service/impl/WarehouseService.java

@@ -265,7 +265,9 @@ public class WarehouseService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
         }
         }
-        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount());
+        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(),
+                warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(),
+                warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount(),warehouseQuery.getSuperiorWarehouseId());
 
 
 
 
         BaseResponse<List<WarehouseDTO>> response;
         BaseResponse<List<WarehouseDTO>> response;
@@ -774,7 +776,7 @@ public class WarehouseService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
         }
         }
-        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount());
+        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount(),warehouseQuery.getSuperiorWarehouseId());
 
 
 
 
         if (CollUtil.isNotEmpty(warehouseList)) {
         if (CollUtil.isNotEmpty(warehouseList)) {
@@ -816,7 +818,7 @@ public class WarehouseService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
         }
         }
-        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount());
+        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount(),warehouseQuery.getSuperiorWarehouseId());
 
 
         BaseResponse<List<WarehouseDTO>> warehouseResponse = new BaseResponse<>(new ArrayList<>());
         BaseResponse<List<WarehouseDTO>> warehouseResponse = new BaseResponse<>(new ArrayList<>());
         List<WarehouseDTO> result = new ArrayList<>();
         List<WarehouseDTO> result = new ArrayList<>();

src/main/resources/mybatis/mapper/extdb/common/WarehouseMapperEx.xml

@@ -135,6 +135,9 @@
         <if test="warehouseLevenId != null and warehouseLevenId != '' ">
         <if test="warehouseLevenId != null and warehouseLevenId != '' ">
             and tw.warehouse_leven_id = #{warehouseLevenId}
             and tw.warehouse_leven_id = #{warehouseLevenId}
         </if>
         </if>
+        <if test="superiorWarehouseId != null and superiorWarehouseId != '' ">
+            and tw.superior_warehouse_id = #{superiorWarehouseId}
+        </if>
         order by tw.create_time desc
         order by tw.create_time desc
     </select>
     </select>