仓库管理的查询返回上级仓库的名字

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

@@ -20,6 +20,7 @@ public class WarehouseEx extends Warehouse {
 
 
     private String pathName;
     private String pathName;
     private String serviceProviderName;
     private String serviceProviderName;
+    private String superiorWarehouseName;
 
 
     public Integer getParentId() {
     public Integer getParentId() {
         return parentId;
         return parentId;
@@ -52,4 +53,12 @@ public class WarehouseEx extends Warehouse {
     public void setServiceProviderName(String serviceProviderName) {
     public void setServiceProviderName(String serviceProviderName) {
         this.serviceProviderName = serviceProviderName;
         this.serviceProviderName = serviceProviderName;
     }
     }
+
+    public String getSuperiorWarehouseName() {
+        return superiorWarehouseName;
+    }
+
+    public void setSuperiorWarehouseName(String superiorWarehouseName) {
+        this.superiorWarehouseName = superiorWarehouseName;
+    }
 }
 }

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

@@ -79,4 +79,6 @@ public class WarehouseDTO implements Serializable {
     private String receiveAddress;
     private String receiveAddress;
     @ApiModelProperty(value = "安装服务商团队的名字")
     @ApiModelProperty(value = "安装服务商团队的名字")
     private String serviceProviderName;
     private String serviceProviderName;
+    @ApiModelProperty(value = "上级仓库的名字")
+    private String superiorWarehouseName;
 }
 }

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

@@ -103,4 +103,10 @@ public interface WarehouseMapperEx {
      * @return
      * @return
      */
      */
     int updateWarehouseisEnabled(@Param("id") String id,@Param("isEnabled") Integer isEnabled);
     int updateWarehouseisEnabled(@Param("id") String id,@Param("isEnabled") Integer isEnabled);
+    /**
+     * 根据上级仓库id获取上级仓库的名称
+     * @param superiorWarehouseId
+     * @return
+     */
+    WarehouseEx wareHouseBySuperiorWarehouseId(@Param("superiorWarehouseId") String superiorWarehouseId);
 }
 }

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

@@ -285,6 +285,11 @@ public class WarehouseService {
                 if (supplier != null){
                 if (supplier != null){
                     warehouseEx.setServiceProviderName(supplier.getName());
                     warehouseEx.setServiceProviderName(supplier.getName());
                 }
                 }
+                //获取上级仓库的名字
+                WarehouseEx warehouseEx1=warehouseMapperEx.wareHouseBySuperiorWarehouseId(warehouseEx.getSuperiorWarehouseId());
+                if (warehouseEx1 !=null){
+                    warehouseEx.setSuperiorWarehouseName(warehouseEx1.getName());
+                }
                 WarehouseDTO warehouseDTO = JSONUtilsEx.deserialize(JSONUtilsEx.serialize(warehouseEx), WarehouseDTO.class);
                 WarehouseDTO warehouseDTO = JSONUtilsEx.deserialize(JSONUtilsEx.serialize(warehouseEx), WarehouseDTO.class);
                 if (warehouseEx.getParentId() == null) {
                 if (warehouseEx.getParentId() == null) {
                     warehouseDTO.setIsDel(0);
                     warehouseDTO.setIsDel(0);

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

@@ -164,4 +164,8 @@
         where id = #{id}
         where id = #{id}
     </update>
     </update>
 
 
+    <select id="wareHouseBySuperiorWarehouseId" parameterType="string" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseEx">
+        select id,name from t_warehouse where id = #{superiorWarehouseId}
+    </select>
+
 </mapper>
 </mapper>
\ No newline at end of file