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

src/main/java/com/boco/nbd/wios/export/Contants.java

@@ -63,9 +63,9 @@ public class Contants {
 
 
     public static final String export_warrantyOrder_field = "no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr";
     public static final String export_warrantyOrder_field = "no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr";
 
 
-    public static final String export_wareHouse_title = "仓库ID,仓库名称,仓库等级ID,仓库归属,区域,安装服务商";
+    public static final String export_wareHouse_title = "序号,仓库名称,仓库等级,所属区域,仓库归属,所属服务商,启用状态,描述";
 
 
-    public static final String export_wareHouse_field = "id,name,warehouseLevenId,warehouseAttribution,area,serviceProvider";
+    public static final String export_wareHouse_field = "no,name,warehouseLevenName,areaName,warehouseAttributionName,serviceProviderName,isEnabledName,msg";
 
 
     public static final String export_single_title = "调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库";
     public static final String export_single_title = "调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库";
 
 

src/main/java/com/boco/nbd/wios/export/impl/WarehouseExport.java

@@ -35,6 +35,10 @@ public class WarehouseExport implements Export<WarehouseDTO2> {
         WarehouseQuery2 condition = mapper.readValue(json, WarehouseQuery2.class);
         WarehouseQuery2 condition = mapper.readValue(json, WarehouseQuery2.class);
         condition.setIsWarehousePage(2);
         condition.setIsWarehousePage(2);
         List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(condition);
         List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(condition);
+        int no = 1;
+        for (WarehouseDTO2 vo : list) {
+            vo.setNo(no++);
+        }
         return list;
         return list;
     }
     }
     
     

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

@@ -44,6 +44,12 @@ public class Warehouse extends CoreEntity {
     private String receivePhone;
     private String receivePhone;
 
 
     private String receiveAddress;
     private String receiveAddress;
+    @ApiModelProperty(value = "仓库等级名称")
+    private String warehouseLevenName;
+    @ApiModelProperty(value = "是否启用的名称")
+    private String isEnabledName;
+    @ApiModelProperty(value = "仓库归属名称")
+    private String warehouseAttributionName;
 
 
     public String getId() {
     public String getId() {
         return id;
         return id;
@@ -189,6 +195,30 @@ public class Warehouse extends CoreEntity {
         this.receiveAddress = receiveAddress;
         this.receiveAddress = receiveAddress;
     }
     }
 
 
+    public String getWarehouseLevenName() {
+        return warehouseLevenName;
+    }
+
+    public void setWarehouseLevenName(String warehouseLevenName) {
+        this.warehouseLevenName = warehouseLevenName;
+    }
+
+    public String getIsEnabledName() {
+        return isEnabledName;
+    }
+
+    public void setIsEnabledName(String isEnabledName) {
+        this.isEnabledName = isEnabledName;
+    }
+
+    public String getWarehouseAttributionName() {
+        return warehouseAttributionName;
+    }
+
+    public void setWarehouseAttributionName(String warehouseAttributionName) {
+        this.warehouseAttributionName = warehouseAttributionName;
+    }
+
     @Override
     @Override
     public boolean equals(Object that) {
     public boolean equals(Object that) {
         if (this == that) {
         if (this == that) {

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

@@ -27,6 +27,8 @@ public class WarehouseDTO implements Serializable {
 
 
     @ApiModelProperty(value = "仓库等级ID")
     @ApiModelProperty(value = "仓库等级ID")
     private String warehouseLevenId;
     private String warehouseLevenId;
+    @ApiModelProperty(value = "仓库等级名称")
+    private String warehouseLevenName;
 
 
     @ApiModelProperty(value = "仓库名称")
     @ApiModelProperty(value = "仓库名称")
     private String name;
     private String name;
@@ -39,6 +41,8 @@ public class WarehouseDTO implements Serializable {
 
 
     @ApiModelProperty(value = "仓库归属")
     @ApiModelProperty(value = "仓库归属")
     private String warehouseAttribution;
     private String warehouseAttribution;
+    @ApiModelProperty(value = "仓库归属名称")
+    private String warehouseAttributionName;
 
 
     @ApiModelProperty(value = "描述")
     @ApiModelProperty(value = "描述")
     private String msg;
     private String msg;
@@ -60,6 +64,8 @@ public class WarehouseDTO implements Serializable {
 
 
     @ApiModelProperty(value = "是否启用 0：否 1：是")
     @ApiModelProperty(value = "是否启用 0：否 1：是")
     private Integer isEnabled;
     private Integer isEnabled;
+    @ApiModelProperty(value = "是否启用的名称")
+    private String isEnabledName;
 
 
     @ApiModelProperty("是否可删除，0：否 1：是")
     @ApiModelProperty("是否可删除，0：否 1：是")
     private Integer isDel;
     private Integer isDel;

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

@@ -12,6 +12,8 @@ public class WarehouseDTO2 extends WarehouseDTO {
     
     
     @ApiModelProperty("区域层级")
     @ApiModelProperty("区域层级")
     private String areaPathCode;
     private String areaPathCode;
+    @ApiModelProperty("序号")
+    private Integer no;
     
     
     public String getAreaName() {
     public String getAreaName() {
         return areaName;
         return areaName;
@@ -36,4 +38,12 @@ public class WarehouseDTO2 extends WarehouseDTO {
     public void setAreaPathCode(String areaPathCode) {
     public void setAreaPathCode(String areaPathCode) {
         this.areaPathCode = areaPathCode;
         this.areaPathCode = areaPathCode;
     }
     }
+
+    public Integer getNo() {
+        return no;
+    }
+
+    public void setNo(Integer no) {
+        this.no = no;
+    }
 }
 }

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

@@ -87,7 +87,20 @@
         tw.receive_address,
         tw.receive_address,
         twl.parent_id parentId,
         twl.parent_id parentId,
         twl.path_code pathCode,
         twl.path_code pathCode,
-        twl.path_name pathName
+        twl.path_name pathName,
+        case
+            when tw.warehouse_attribution = 1 then 'CAMS仓库'
+            when tw.warehouse_attribution = 2 then '安装服务商仓库'
+        end warehouseAttributionName,
+        case
+            when tw.warehouse_leven_id = 0 then '总仓'
+            when tw.warehouse_leven_id = 1 then '仓库'
+            when tw.warehouse_leven_id = 2 then '网点'
+        end warehouseLevenName,
+        case
+            when tw.is_enabled = 0 then '已禁用'
+            when tw.is_enabled = 1 then '已启用'
+        end isEnabledName
         from
         from
         t_warehouse tw
         t_warehouse tw
         LEFT JOIN t_warehouse_leven twl on tw.warehouse_leven_id = twl.id
         LEFT JOIN t_warehouse_leven twl on tw.warehouse_leven_id = twl.id