8/21

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java

@@ -91,23 +91,23 @@ public class ShStorehouseRest {
 		return resultBean;
 	}
 	@ApiOperation("查询所有可用仓库")
-	@GetMapping("/selectStoreHouse")
-	public ResultBean selectStoreHouse(){
+	@PostMapping("/selectStoreHouse")
+	public ResultBean selectStoreHouse(@RequestBody List<String> List){
 		ResultBean rb = ResultBean.fireFail();
-		List<ShStorehouseVo> list= shStorehouseService.selectStoreHouse();
+		List<ShStorehouseVo> list= shStorehouseService.selectStoreHouse(List);
 		return rb.success().setData(list);
 	}
 
 	/**
-	 * 修改时需要选择的仓库
+	 * 根据仓库sid查询仓库信息
 	 * @return
 	 */
 	@ApiOperation("根据仓库sid查询仓库信息")
 	@GetMapping("/selectStoreBySid")
-	public ResultBean selectStoreBySid(@RequestParam("sid")String sid){
+	public ResultBean<ShStorehouseVo> selectStoreBySid(@RequestParam("shSid")String shSid){
 		ResultBean rb = ResultBean.fireFail();
-		List<ShStorehouseVo> list= shStorehouseService.selectStoreBySid(sid);
-		return rb.success().setData(list);
+		ShStorehouseVo shStorehouseVo= shStorehouseService.selectStoreBySid(shSid);
+		return rb.success().setData(shStorehouseVo);
 	}
 	@ApiOperation("根据项目sid查询仓库")
 	@GetMapping("/getStorehouseBySid")

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

@@ -59,9 +59,9 @@ 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);
+	List<ShStorehouseVo> selectSh(List<String> list);
+	@Select("select * from  sh_storehouse  where sid=#{shSid}")
+	ShStorehouseVo selectStoreBySid(@Param("shSid")String shSid);
 	@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

@@ -102,12 +102,12 @@ public class ShStorehouseService extends MybatisBaseService<ShStorehouseMapper,
 		return p;
 	}
 
-	public List<ShStorehouseVo> selectStoreHouse() {
-		List<ShStorehouseVo> pagging = baseMapper.selectSh();
+	public List<ShStorehouseVo> selectStoreHouse(List<String> list) {
+		List<ShStorehouseVo> pagging = baseMapper.selectSh(list);
 		return pagging;
 	}
-	public List<ShStorehouseVo> selectStoreBySid(String sid) {
-		List<ShStorehouseVo> pagging = baseMapper.selectStoreBySid(sid);
+	public ShStorehouseVo selectStoreBySid(String shSid) {
+		ShStorehouseVo pagging = baseMapper.selectStoreBySid(shSid);
 		return pagging;
 	}
 	public List<ShStorehouseVo> getStorehouseBySid(String sid) {

warehousing-system/project/wh-manage/src/main/resources/mappers/ShStorehouseMapper.xml

@@ -7,7 +7,14 @@
 		SELECT * FROM sh_storehouse <where> ${ew.sqlSegment} </where>
 	</select>
 	<select id="selectSh" resultType="com.wh.pojo.shstorehouse.ShStorehouseVo">
-		SELECT * FROM sh_storehouse WHERE sid not in(select sh_sid from storehouse_project )
+		SELECT * FROM sh_storehouse
+		<if test="list.size!=0">
+			WHERE sid not in
+			<foreach item="shSid" collection="list" open="(" separator="," close=")">
+				#{shSid}
+			</foreach>
+		</if>
+
 	</select>
 	<select id="selectListAllVo" resultType="com.wh.pojo.shstorehouse.ShStorehouseVo">
 		SELECT * FROM sh_storehouse <where> ${ew.sqlSegment} </where>

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectVo.java

@@ -14,5 +14,6 @@ public class StoreHouseProjectVo implements Vo {
     private String shSid;
     private String projectSid;
     //仓库名称
-    private String shName;
+    private String name;
+    private String picUrl; // 图片访问url
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.crm.api.projectinformation.*;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
+import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService;
 import com.yxt.supervise.crm.feign.system.SysUserFeign;
 import com.yxt.supervise.crm.feign.wh.ShStorehouseFeign;
 import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
@@ -32,6 +33,8 @@ public class ProjectInformationRest implements ProjectInformationFeign {
     @Autowired
     StoreHouseProjectFeign storeHouseProjectFeign;
     @Autowired
+    StoreHouseProjectService storeHouseProjectService;
+    @Autowired
     SysUserFeign sysUserFeign;
 
     @ApiOperation("根据条件分页查询数据的列表")
@@ -76,7 +79,8 @@ public class ProjectInformationRest implements ProjectInformationFeign {
     @ApiOperation("根据查询所有可用的仓库信息")
     @GetMapping("/selectStoreHouse")
     public ResultBean getStorehouseBySid (){
-        ResultBean r=shStorehouseFeign.selectStoreHouse();
+        List<String> list=storeHouseProjectService.getAllShSid();
+        ResultBean r=shStorehouseFeign.selectStoreHouse(list);
         return r;
     }
     @ApiOperation("根据项目sid查询仓库")

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -16,6 +16,7 @@ import com.yxt.supervise.crm.biz.bankmanager.BankManagerService;
 import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
 import com.yxt.supervise.crm.biz.loanbankinformation.LoanBankInformationService;
 import com.yxt.supervise.crm.api.userproject.UserProject;
+import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService;
 import com.yxt.supervise.crm.biz.userproject.UserProjectService;
 import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
 import com.yxt.supervise.system.sysuser.SysUser;
@@ -33,8 +34,6 @@ import java.util.*;
  */
 @Service
 public class ProjectInformationService extends MybatisBaseService<ProjectInformationMapper, ProjectInformation> {
-    @Autowired
-    StoreHouseProjectFeign storeHouseProjectFeign;
     @Autowired
     EnterpriseProjectService enterpriseProjectService;
     @Autowired
@@ -45,6 +44,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
     LoanBankInformationService bankInformationService;
     @Autowired
     UserProjectService userProjectService;
+    @Autowired
+    StoreHouseProjectService storeHouseProjectService;
     public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq) {
         ProjectInformationQuery query = pq.getParams();
         QueryWrapper<ProjectInformation> qw = new QueryWrapper<>();
@@ -81,7 +82,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         //绑定仓库
         dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
-        storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
+        storeHouseProjectService.saveOrUpdateDto(dto.getStoreHouseProjectDto());
         //绑定企业
         if(null!=dto.getEnterpriseProjectDto()){
             dto.getEnterpriseProjectDto().setProjectSid(entity.getSid());
@@ -98,7 +99,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         //修改绑定的仓库
         dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
-        storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
+        storeHouseProjectService.saveOrUpdateDto(dto.getStoreHouseProjectDto());
         //绑定企业
         if(null!=dto.getEnterpriseProjectDto()){
             enterpriseProjectService.update(dto.getEnterpriseProjectDto());

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface StoreHouseProjectMapper extends BaseMapper<StoreHouseProject> {
     @Select("select * from storehouse_project where projectSid=#{sid}")
     List<StoreHouseProjectVo> selectStoreBySid(@Param("sid")String sid);
+    @Select("select shSid from storehouse_project")
+    List<String> getAllShSid();
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java

@@ -3,11 +3,14 @@ package com.yxt.supervise.crm.biz.storehouseproject;
 
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
+import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/7/19 15:31
@@ -35,7 +38,7 @@ public class StoreHouseProjectRest {
     @PostMapping("/selectStoreBySid/{sid}")
     public ResultBean selectStoreBySid(@PathVariable("sid")String sid){
         ResultBean rb = ResultBean.fireFail();
-        storeHouseProjectService.selectStoreBySid(sid);
-        return rb.success();
+        List<StoreHouseProjectVo>list= storeHouseProjectService.selectStoreBySid(sid);
+        return rb.success().setData(list);
     }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.UUID;
 
 /**
  * @author wangpengfei
@@ -37,12 +38,15 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
 
 
     public void insertByDto(StoreHouseProjectDto dto) {
+
+
+        //删除之前选择的仓库信息
+        baseMapper.delete(new QueryWrapper<StoreHouseProject>().eq("projectSid",dto.getProjectSid()));
         StoreHouseProject entity = new StoreHouseProject();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        //删除之前选择的仓库信息
-        baseMapper.delete(new QueryWrapper<StoreHouseProject>().eq("project_sid",dto.getProjectSid()));
-
         for(String shSid:dto.getShSids()){
+
+            entity.setSid(UUID.randomUUID().toString());
             entity.setShSid(shSid);
             baseMapper.insert(entity);
         }
@@ -53,11 +57,12 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
             return;
         }
         //删除之前选择的仓库信息
-        baseMapper.delete(new QueryWrapper<StoreHouseProject>().eq("project_sid",dto.getProjectSid()));
+        baseMapper.delete(new QueryWrapper<StoreHouseProject>().eq("projectSid",dto.getProjectSid()));
         //重新新增
         StoreHouseProject entity = new StoreHouseProject();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         for(String shSid:dto.getShSids()){
+            entity.setSid(UUID.randomUUID().toString());
             entity.setShSid(shSid);
             baseMapper.insert(entity);
         }
@@ -66,9 +71,14 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
         List<StoreHouseProjectVo> pagging = baseMapper.selectStoreBySid(sid);
         for(StoreHouseProjectVo vo:pagging){
             String shSid=vo.getShSid();
-            ShStorehouseVo shStorehouseVo=(ShStorehouseVo) shStorehouseFeign.selectStoreBySid(shSid).getData();
-            vo.setShName(shStorehouseVo.getName());
+            ShStorehouseVo shStorehouseVo=shStorehouseFeign.selectStoreBySid(shSid).getData();
+            vo.setName(shStorehouseVo.getName());
+            vo.setPicUrl(shStorehouseVo.getPicUrl());
         }
         return pagging;
     }
+    public List<String> getAllShSid() {
+        List<String> pagging = baseMapper.getAllShSid();
+        return pagging;
+    }
 }

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

@@ -3,8 +3,12 @@ package com.yxt.supervise.crm.feign.wh;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/7/19 13:55
@@ -16,9 +20,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();
+    @PostMapping("/selectStoreHouse")
+    public ResultBean selectStoreHouse(@RequestBody List<String> list);
     @GetMapping("/selectStoreBySid")
-    public ResultBean selectStoreBySid(@RequestParam("sid")String sid);
+    public ResultBean<ShStorehouseVo> selectStoreBySid(@RequestParam("shSid")String shSid);
 
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java

@@ -283,8 +283,8 @@ public class SysUserRest implements SysUserFeign {
         String password = mobile.substring(5, 11);
         String md5 = Encodes.md5(password);
         SysUser su = new SysUser();
-        su.setSid(UUID.randomUUID().toString());
         dto.fillEntity(su);
+        su.setSid(UUID.randomUUID().toString());
         su.setStaffSid(dto.getBankMessageSid());
         su.setUserName(mobile);
         su.setPassword(md5);