库存对外接口

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java

@@ -87,4 +87,9 @@ public class WarehouseInfoRest {
     public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) {
         return wmsWarehouseService.getWareHouse(createOrgSid);
     }
+    @ApiOperation("统计各省仓库")
+    @GetMapping("/getWarehouseCountByOrgSid")
+    public ResultBean<List<WarehouseInfoVoSheng>> getWarehouseCountByOrgSid(@RequestParam("orgSid") String orgSid) {
+        return wmsWarehouseService.getWarehouseCountByOrgSid(orgSid);
+    }
 }

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;//纬度

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;//纬度

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java

@@ -24,6 +24,8 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
     @Select("select * from wms_warehouse_info")
     List<WarehouseAreaAllVo> selectAll();
     List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
+    List<WarehouseInfoVoSheng> getAddressGroup(@Param("orgPath")String orgPath);
+    List<WarehouseInfoVo> getAddressGroupByGSD(@Param("belongingPlace")String belongingPlace);
 
     List<SmsOrderHouseInfo> getWareHouse(@Param("createOrgSid") String createOrgSid);
 

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'
         </where>
     </select>
+    <select id="getAddressGroup" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVoSheng">
+        select
+        a.*
+        from warehouse_info a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            s.orgSidPath like concat('%',#{orgPath},'%') group by belongingPlace;
+        </where>
+    </select>
     <select id="getWareHouse" resultType="com.yxt.warehouse.biz.warehouseinfo.SmsOrderHouseInfo">
         select
             sid as warehouseSid,
@@ -46,6 +55,15 @@
         from warehouse_rack
         where warehouseSid =#{warehouseSid}
     </select>
+    <select id="getAddressGroupByGSD" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
+        select
+        a.*
+        from warehouse_info a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            a.address like concat('%',#{belongingPlace},'%')
+        </where>
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE warehouse_info
         SET isDelete=1

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java

@@ -207,4 +207,17 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         }
        return rb.success();
     }
+    public ResultBean<List<WarehouseInfoVoSheng>> getWarehouseCountByOrgSid(String orgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<WarehouseInfoVoSheng> list = baseMapper.getAddressGroup(orgSid);
+        if (list.size()!=0) {
+            for (WarehouseInfoVoSheng warehouseInfoVo : list) {
+                List<WarehouseInfoVo> c = baseMapper.getAddressGroupByGSD(warehouseInfoVo.getBelongingPlace());
+                warehouseInfoVo.setList(c);
+            }
+            return rb.success().setData(list);
+        }
+        return rb.success();
+    }
+
 }

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java

@@ -46,4 +46,5 @@ public class WarehouseInfoVo implements Vo {
     private List<WarehouseExtendVo> wmsWarehouseExtendVos;
     private String userSid;
     private String orgPath;
+    private String belongingPlace;//归属地
 }

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<WarehouseInfoVo> list=new ArrayList<>();
+}