存放地点分页列表增加市\区县

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@@ -61,16 +61,10 @@ public class ScmWarehouseVo implements Vo {
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
 
-	@ApiModelProperty("省sid")
-	private String provinceSid;
 	@ApiModelProperty("province")
 	private String province;
-	@ApiModelProperty("市sid")
-	private String citySid;
 	@ApiModelProperty("city")
 	private String city;
-	@ApiModelProperty("收货县区sid")
-	private String countySid;
 	@ApiModelProperty("county")
 	private String county;
     

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -99,6 +99,9 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         QueryWrapper<ScmWarehouse> qw = createQueryWrapper(query);
         IPage<ScmWarehouse> page = PagerUtil.queryToPage(pq);
         IPage<ScmWarehouseVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmWarehouseVo record : pagging.getRecords()) {
+            record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute());
+        }
         PagerVo<ScmWarehouseVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }