Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/boco/nbd/wios/manage/controller/WarehouseController.java

@@ -92,6 +92,20 @@ public class WarehouseController {
     @GetMapping(value = "warehouse/all")
     @ApiOperation(value = "查询仓库")
     public BaseResponse<List<WarehouseDTO2>> qryWarehouseList(WarehouseQuery2 warehouseQuery2) {
+        warehouseQuery2.setIsWarehousePage(1);
+        List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(warehouseQuery2);
+        return new BaseResponse<List<WarehouseDTO2>>(list);
+    }
+    /**
+     * 查询仓库不分页
+     *
+     * @param warehouseQuery2
+     * @return
+     */
+    @GetMapping(value = "warehouse/allNoPage")
+    @ApiOperation(value = "查询仓库")
+    public BaseResponse<List<WarehouseDTO2>> qryWarehouseListNoPage(WarehouseQuery2 warehouseQuery2) {
+        warehouseQuery2.setIsWarehousePage(2);
         List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(warehouseQuery2);
         return new BaseResponse<List<WarehouseDTO2>>(list);
     }

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 serviceProviderName;
+    private String superiorWarehouseName;
 
     public Integer getParentId() {
         return parentId;
@@ -52,4 +53,12 @@ public class WarehouseEx extends Warehouse {
     public void setServiceProviderName(String 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;
     @ApiModelProperty(value = "安装服务商团队的名字")
     private String serviceProviderName;
+    @ApiModelProperty(value = "上级仓库的名字")
+    private String superiorWarehouseName;
 }

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

@@ -47,6 +47,8 @@ public class WarehouseQuery {
 
     @ApiModelProperty(value = "分页数量",required = true)
     private Integer pagecount;
+    @ApiModelProperty("是否分页，1是分页,2是不分页")
+    private Integer isWarehousePage;
 
     public String getId() {
         return id;
@@ -135,4 +137,12 @@ public class WarehouseQuery {
     public void setCreateAccount(String createAccount) {
         this.createAccount = createAccount;
     }
+
+    public Integer getIsWarehousePage() {
+        return isWarehousePage;
+    }
+
+    public void setIsWarehousePage(Integer isWarehousePage) {
+        this.isWarehousePage = isWarehousePage;
+    }
 }

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

@@ -103,4 +103,10 @@ public interface WarehouseMapperEx {
      * @return
      */
     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

@@ -265,7 +265,10 @@ public class WarehouseService {
         }
         warehouseQuery.setAppkey(appkey);
         logger.info("qryWarehouseList请求数据:{}", JSONUtilsEx.serialize(warehouseQuery));
+        System.out.println("分页"+warehouseQuery.getPage());
+       if (warehouseQuery.getIsWarehousePage()==1){
            PageLimitHolderFilter.setContext(warehouseQuery.getPage(), warehouseQuery.getPagecount(), 0);
+       }
         List<String> serviceProviders = new ArrayList<>(1);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
@@ -285,6 +288,11 @@ public class WarehouseService {
                 if (supplier != null){
                     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);
                 if (warehouseEx.getParentId() == null) {
                     warehouseDTO.setIsDel(0);

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

@@ -164,4 +164,8 @@
         where id = #{id}
     </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>
\ No newline at end of file