仓库和项目关联新增

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<String> shSids;
 }

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<ShStorehouseVo> list= shStorehouseService.selectStoreHouse();
+		return rb.success().setData(list);
+	}
 
+	/**
+	 * 修改时需要选择的仓库
+	 * @return
+	 */
+	@ApiOperation("此项目已选择的仓库")
+	@GetMapping("/selectStoreBySid")
+	public ResultBean selectStoreBySid(@RequestParam("sid")String sid){
+		ResultBean rb = ResultBean.fireFail();
+		List<ShStorehouseVo> list= shStorehouseService.selectStoreBySid(sid);
+		return rb.success().setData(list);
+	}
 	@ApiOperation("根据项目sid查询仓库")
 	@GetMapping("/getStorehouseBySid")
 	public ResultBean<List<ShStorehouseVo>> getStorehouseBySid(String sid){

warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java

@@ -60,6 +60,8 @@ public interface ShStorehouseMapper extends BaseMapper<ShStorehouse> {
 	IPage<ShStorehouseVo> selectPageVo(IPage<ShStorehouse> page, @Param(Constants.WRAPPER) Wrapper<ShStorehouse> qw);
 
 	List<ShStorehouseVo> selectSh();
+	@Select("select s.* from storehouse_project p left join sh_storehouse s on s.sid=p.sh_sid where project_sid=#{sid}")
+	List<ShStorehouseVo> 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<ShStorehouseVo> getStorehouseBySid(@Param("sid") String sid);
 

warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java

@@ -98,10 +98,15 @@ public class ShStorehouseService extends MybatisBaseService<ShStorehouseMapper,
 		PagerVo<ShStorehouseVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	public List<ShStorehouseVo> selectSh() {
+
+	public List<ShStorehouseVo> selectStoreHouse() {
 		List<ShStorehouseVo> pagging = baseMapper.selectSh();
 		return pagging;
 	}
+	public List<ShStorehouseVo> selectStoreBySid(String sid) {
+		List<ShStorehouseVo> pagging = baseMapper.selectStoreBySid(sid);
+		return pagging;
+	}
 	public List<ShStorehouseVo> getStorehouseBySid(String sid) {
 		List<ShStorehouseVo> pagging = baseMapper.getStorehouseBySid(sid);
 		return pagging;

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<StoreHouseProje
     public void insertByDto(StoreHouseProjectDto dto) {
         StoreHouseProject entity = new StoreHouseProject();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
+        //删除之前选择的仓库信息
+        baseMapper.delete(new QueryWrapper<StoreHouseProject>().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<StoreHouseProject>().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);
+        }
     }
 
 }

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;
 }

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<String> shSids;//仓库sid集合
 }

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){

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<ProjectInformationMapper, ProjectInformation> {
+    @Autowired
+    StoreHouseProjectFeign storeHouseProjectFeign;
     public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq) {
         ProjectInformationQuery query = pq.getParams();
         QueryWrapper<ProjectInformation> qw = new QueryWrapper<>();
@@ -56,6 +60,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
                 baseMapper.insertFiles(maps);
             }
         }
+        dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
+        storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
         baseMapper.insert(entity);
         return rb.success().setMsg("保存项目信息成功");
     }
@@ -64,6 +70,9 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         String dtoSid = dto.getSid();
         ProjectInformation entity=fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        //修改绑定的仓库
+        dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
+        storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
         baseMapper.updateById(entity);
         return rb.success().setMsg("修改项目信息成功");
     }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/wh/ShStorehouseFeign.java

@@ -16,4 +16,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface ShStorehouseFeign {
     @GetMapping("/getStorehouseBySid")
     public ResultBean getStorehouseBySid(@RequestParam("sid") String sid);
+    @GetMapping("/selectStoreHouse")
+    public ResultBean selectStoreHouse();
+    @GetMapping("/selectStoreBySid")
+    public ResultBean selectStoreBySid(@RequestParam("sid")String sid);
+
 }