diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java index 9944b05f..8f786ecb 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java @@ -15,4 +15,5 @@ public class StoreHouseProjectDto implements Dto { private String sid; private String shSid;//仓库sid private String projectSid;//项目sid + private List shSids; } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java index 5c0b6e5e..eb1279fe 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java @@ -90,7 +90,25 @@ public class ShStorehouseRest { ResultBean resultBean = projectInformationFeign.listAll(); return resultBean; } + @ApiOperation("查询所有可用仓库") + @GetMapping("/selectStoreHouse") + public ResultBean selectStoreHouse(){ + ResultBean rb = ResultBean.fireFail(); + List list= shStorehouseService.selectStoreHouse(); + return rb.success().setData(list); + } + /** + * 修改时需要选择的仓库 + * @return + */ + @ApiOperation("此项目已选择的仓库") + @GetMapping("/selectStoreBySid") + public ResultBean selectStoreBySid(@RequestParam("sid")String sid){ + ResultBean rb = ResultBean.fireFail(); + List list= shStorehouseService.selectStoreBySid(sid); + return rb.success().setData(list); + } @ApiOperation("根据项目sid查询仓库") @GetMapping("/getStorehouseBySid") public ResultBean> getStorehouseBySid(String sid){ diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java index baba07af..abaeee73 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java @@ -60,6 +60,8 @@ public interface ShStorehouseMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectSh(); + @Select("select s.* from storehouse_project p left join sh_storehouse s on s.sid=p.sh_sid where project_sid=#{sid}") + List selectStoreBySid(@Param("sid")String sid); @Select("select * from storehouse_project p left join sh_storehouse s on s.sid=p.sh_sid where p.project_sid=#{sid}") List getStorehouseBySid(@Param("sid") String sid); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java index 10fe99a1..47d2abad 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java @@ -98,10 +98,15 @@ public class ShStorehouseService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public List selectSh() { + + public List selectStoreHouse() { List pagging = baseMapper.selectSh(); return pagging; } + public List selectStoreBySid(String sid) { + List pagging = baseMapper.selectStoreBySid(sid); + return pagging; + } public List getStorehouseBySid(String sid) { List pagging = baseMapper.getStorehouseBySid(sid); return pagging; diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java index fddbbd52..f19f8cee 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java @@ -1,6 +1,7 @@ package com.wh.service.storehouseproject; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.wh.mapper.storehouseproject.StoreHouseProjectMapper; import com.wh.pojo.shstorehouse.ShStorehouse; import com.wh.pojo.shstorehouse.ShStorehouseDto; @@ -37,15 +38,28 @@ public class StoreHouseProjectService extends MybatisBaseService().eq("project_sid",dto.getProjectSid())); + + for(String shSid:dto.getShSids()){ + entity.setShSid(shSid); + baseMapper.insert(entity); + } } public void updateByDto(StoreHouseProjectDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; } - StoreHouseProject entity = fetchBySid(dtoSid); - baseMapper.updateById(entity); + //删除之前选择的仓库信息 + baseMapper.delete(new QueryWrapper().eq("project_sid",dto.getProjectSid())); + //重新新增 + StoreHouseProject entity = new StoreHouseProject(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + for(String shSid:dto.getShSids()){ + entity.setShSid(shSid); + baseMapper.insert(entity); + } } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java index 8af8c12e..b835f6bf 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java @@ -1,6 +1,7 @@ package com.yxt.supervise.crm.api.projectinformation; import com.yxt.common.core.dto.Dto; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -42,4 +43,6 @@ public class ProjectInformationDto implements Dto { //项目说明 private String remarks; private String [] imageFiles; + //仓库信息dto + private StoreHouseProjectDto storeHouseProjectDto; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java index fd0528c9..d86148fa 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java @@ -3,6 +3,8 @@ package com.yxt.supervise.crm.api.storehouseproject; import com.yxt.common.core.dto.Dto; import lombok.Data; +import java.util.List; + /** * @author wangpengfei * @date 2023/7/19 15:37 @@ -13,4 +15,5 @@ public class StoreHouseProjectDto implements Dto { private String sid; private String shSid;//仓库sid private String projectSid;//项目sid + private List shSids;//仓库sid集合 } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index 9dc18d20..6535ef14 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -69,6 +69,18 @@ public class ProjectInformationRest implements ProjectInformationFeign { ResultBean r=shStorehouseFeign.getStorehouseBySid(sid); return r; } + @ApiOperation("根据查询所有可用的仓库信息") + @GetMapping("/selectStoreHouse") + public ResultBean getStorehouseBySid (){ + ResultBean r=shStorehouseFeign.selectStoreHouse(); + return r; + } + @ApiOperation("根据查询所有可用的仓库信息") + @GetMapping("/selectStoreHouse/{sid}") + public ResultBean selectStoreBySid (@PathVariable String sid){ + ResultBean r=shStorehouseFeign.selectStoreBySid(sid); + return r; + } @ApiOperation("根据sid查询项目名称") @GetMapping("/getProjectNameBySid") public String getProjectNameBySid (@RequestParam("sid")String sid){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index fa87ec72..b87e6c5c 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -13,6 +13,8 @@ import com.yxt.supervise.crm.api.projectinformation.ProjectInformation; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; +import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -23,6 +25,8 @@ import java.util.*; */ @Service public class ProjectInformationService extends MybatisBaseService { + @Autowired + StoreHouseProjectFeign storeHouseProjectFeign; public PagerVo listPageVo(PagerQuery pq) { ProjectInformationQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -56,6 +60,8 @@ public class ProjectInformationService extends MybatisBaseService