diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index 68de7dc..f289a98 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -87,4 +87,9 @@ public class WarehouseInfoRest { public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) { return wmsWarehouseService.getWareHouse(createOrgSid); } + @ApiOperation("统计各省仓库") + @GetMapping("/getWarehouseCountByOrgSid") + public ResultBean> getWarehouseCountByOrgSid(@RequestParam("orgSid") String orgSid) { + return wmsWarehouseService.getWarehouseCountByOrgSid(orgSid); + } } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java index 866f207..7114a51 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java @@ -18,6 +18,7 @@ public class WarehouseInfo extends BaseEntity { private String manager;//主管 private String areaSid;//地区sid private String address;//地址 + private String belongingPlace;//归属地 private String lngAndLat;//经纬度 private String longitude;//经度 private String latitude;//纬度 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java index e2556ba..9832689 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java @@ -32,6 +32,7 @@ public class WarehouseInfoDto implements Dto { private String manager;//主管 private String areaSid;//地区sid private String address;//地址 + private String belongingPlace;//归属地 private String lngAndLat;//经纬度 private String longitude;//经度 private String latitude;//纬度 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java index 6e69cd2..1591bde 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java @@ -24,6 +24,8 @@ public interface WarehouseInfoMapper extends BaseMapper { @Select("select * from wms_warehouse_info") List selectAll(); List listAll(@Param("orgPath")String orgPath); + List getAddressGroup(@Param("orgPath")String orgPath); + List getAddressGroupByGSD(@Param("belongingPlace")String belongingPlace); List getWareHouse(@Param("createOrgSid") String createOrgSid); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml index 85a187b..c878e31 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml @@ -31,6 +31,15 @@ s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable ='1' + + UPDATE warehouse_info SET isDelete=1 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java index b447a4c..f588b50 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -207,4 +207,17 @@ public class WarehouseInfoService extends MybatisBaseService> getWarehouseCountByOrgSid(String orgSid) { + ResultBean rb = ResultBean.fireFail(); + List list = baseMapper.getAddressGroup(orgSid); + if (list.size()!=0) { + for (WarehouseInfoVoSheng warehouseInfoVo : list) { + List c = baseMapper.getAddressGroupByGSD(warehouseInfoVo.getBelongingPlace()); + warehouseInfoVo.setList(c); + } + return rb.success().setData(list); + } + return rb.success(); + } + } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java index 567fd49..6e908d4 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java @@ -46,4 +46,5 @@ public class WarehouseInfoVo implements Vo { private List wmsWarehouseExtendVos; private String userSid; private String orgPath; + private String belongingPlace;//归属地 } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVoSheng.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVoSheng.java new file mode 100644 index 0000000..f48728d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVoSheng.java @@ -0,0 +1,16 @@ +package com.yxt.warehouse.biz.warehouseinfo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/9/12 14:08 + */ +@Data +public class WarehouseInfoVoSheng { + private String belongingPlace;//归属地 + List list=new ArrayList<>(); +}