Browse Source

仓库和项目关联新增

master
wangpengfei 2 years ago
parent
commit
62c9b53311
  1. 4
      warehousing-system/project/wh-manage/src/main/java/com/wh/controller/storehouseproject/StoreHouseProjectRest.java
  2. 2
      warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java
  3. 2
      warehousing-system/project/wh-manage/src/main/resources/mappers/ShStorehouseMapper.xml
  4. 18
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProject.java
  5. 16
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java
  6. 16
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectQuery.java
  7. 16
      yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectVo.java
  8. 13
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
  9. 22
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/wh/StoreHouseProjectFeign.java
  10. 15
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java
  11. 23
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseFeign.java
  12. 99
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseQuery.java

4
warehousing-system/project/wh-manage/src/main/java/com/wh/controller/storehouseproject/StoreHouseProjectRest.java

@ -26,8 +26,8 @@ public class StoreHouseProjectRest {
//
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody StoreHouseProjectDto dto){
@PostMapping("/saveOrUpdateDto")
public ResultBean saveOrUpdateDto(@RequestBody StoreHouseProjectDto dto){
ResultBean rb = ResultBean.fireFail();
storeHouseProjectService.saveOrUpdateDto(dto);
return rb.success();

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

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

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

@ -7,7 +7,7 @@
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 shSid from storehouse_project )
SELECT * FROM sh_storehouse WHERE sid not in(select sh_sid from storehouse_project )
</select>
<select id="selectListAllVo" resultType="com.wh.pojo.shstorehouse.ShStorehouseVo">
SELECT * FROM sh_storehouse <where> ${ew.sqlSegment} </where>

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

@ -0,0 +1,18 @@
package com.yxt.supervise.crm.api.storehouseproject;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/7/19 15:37
*/
@Data
@ApiModel(value = "仓库 项目关联表", description = "仓库项目关联表")
@TableName("storehouse_project")
public class StoreHouseProject extends BaseEntity {
private String shSid;
private String projectSid;
}

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

@ -0,0 +1,16 @@
package com.yxt.supervise.crm.api.storehouseproject;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/7/19 15:37
*/
@Data
public class StoreHouseProjectDto implements Dto {
private String id;
private String sid;
private String shSid;
private String projectSid;
}

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

@ -0,0 +1,16 @@
package com.yxt.supervise.crm.api.storehouseproject;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/7/19 15:37
*/
@Data
public class StoreHouseProjectQuery implements Query {
private String id;
private String sid;
private String shSid;
private String projectSid;
}

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

@ -0,0 +1,16 @@
package com.yxt.supervise.crm.api.storehouseproject;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/7/19 15:37
*/
@Data
public class StoreHouseProjectVo implements Vo {
private String id;
private String sid;
private String shSid;
private String projectSid;
}

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

@ -7,7 +7,9 @@ import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto;
import com.yxt.supervise.crm.api.projectinformation.ProjectInformationFeign;
import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery;
import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo;
import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
import com.yxt.supervise.crm.feign.wh.ShStorehouseFeign;
import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -25,6 +27,8 @@ public class ProjectInformationRest implements ProjectInformationFeign {
ProjectInformationService ProjectInformationService;
@Autowired
ShStorehouseFeign shStorehouseFeign;
@Autowired
StoreHouseProjectFeign storeHouseProjectFeign;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ -55,11 +59,16 @@ public class ProjectInformationRest implements ProjectInformationFeign {
}
@ApiOperation("根据sid查询仓库信息")
@GetMapping("/getStorehouseBySid/{sid}")
public ResultBean ResultBean (@PathVariable String sid){
// ResultBean rb = ResultBean.fireFail();
public ResultBean getStorehouseBySid (@PathVariable String sid){
ResultBean r=shStorehouseFeign.getStorehouseBySid(sid);
return r;
}
@ApiOperation("项目绑定或修改仓库")
@GetMapping("/saveOrUpdateDto")
public ResultBean saveOrUpdateDto (@RequestBody StoreHouseProjectDto dto){
ResultBean r=storeHouseProjectFeign.saveOrUpdateDto(dto);
return r;
}
@ApiOperation("删除")
@DeleteMapping("/delete/{sid}")
public ResultBean delete(@PathVariable String sid) {

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

@ -0,0 +1,22 @@
package com.yxt.supervise.crm.feign.wh;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
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;
/**
* @author wangpengfei
* @date 2023/7/20 8:41
*/
@FeignClient(
contextId = "supervise-wm-storehouseproject",
name = "supervise-wm",
path = "/v1/storehouseproject")
public interface StoreHouseProjectFeign {
@PostMapping("/saveOrUpdateDto")
public ResultBean saveOrUpdateDto(@RequestBody StoreHouseProjectDto dto);
}

15
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java

@ -40,6 +40,8 @@ import com.yxt.supervise.system.sysstafforg.SysStaffOrgService;
import com.yxt.supervise.system.sysstafforg.SysStaffOrgVo;
import com.yxt.supervise.system.sysuser.SysUser;
import com.yxt.supervise.system.sysuser.SysUserService;
import com.yxt.supervise.wh.ShStorehouseFeign;
import com.yxt.supervise.wh.ShStorehouseQuery;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -75,6 +77,8 @@ public class FlowableRest{
private SysStaffOrgService sysStaffOrgService;
@Autowired
private SysUserService sysUserService;
@Autowired
private ShStorehouseFeign shStorehouseFeign;
// @Autowired
// private ProcessCommentFeign processCommentFeign;
///*
@ -318,8 +322,15 @@ public class FlowableRest{
String [] urls={"http://192.168.1.193:7008/upload/1.jpg","http://192.168.1.193:7008/upload/2.jpg"};
flowTaskVo.setImageUrl(urls);
flowTaskVo.setPendingWork(6);
success.setData(flowTaskVo);
success.success().setData(flowTaskVo);
return success;
}
@PostMapping("/storeHouseListPage")
public ResultBean task(@RequestBody PagerQuery<ShStorehouseQuery> pq) {
return shStorehouseFeign.listPage(pq);
}
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
return shStorehouseFeign.fetchDetailsBySid(sid);
}
}

23
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseFeign.java

@ -0,0 +1,23 @@
package com.yxt.supervise.wh;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2023/7/19 13:55
*/
@FeignClient(
contextId = "supervise-wm-shstorehouse",
name = "supervise-wm",
path = "/v1/shstorehouse")
public interface ShStorehouseFeign {
@GetMapping("/getStorehouseBySid")
public ResultBean getStorehouseBySid(@RequestParam("sid") String sid);
@PostMapping("/listPage")
public ResultBean listPage(@RequestBody PagerQuery<ShStorehouseQuery> pq);
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
}

99
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/wh/ShStorehouseQuery.java

@ -0,0 +1,99 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.supervise.wh;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt_supervise(宇信通监管) <br/>
* File: ShStorehouseQuery.java <br/>
* Class: com.wh.api.shstorehouse.ShStorehouseQuery <br/>
* Description: 库房信息表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-06-14 23:18:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "库房信息表 查询条件", description = "库房信息表 查询条件")
public class ShStorehouseQuery implements Query {
@ApiModelProperty("客户Sid(企业)")
private String custerSid; // 客户Sid(企业)
@ApiModelProperty("客户名称(企业)")
private String custerName; // 客户名称(企业)
@ApiModelProperty("仓库名称")
private String name; // 仓库名称
@ApiModelProperty("仓库简称")
private String simpleName; // 仓库简称
@ApiModelProperty("仓库编码")
private String code; // 仓库编码
@ApiModelProperty("所属省份编码")
private String provinceCode; // 所属省份编码
@ApiModelProperty("所属省份名称")
private String provinceName; // 所属省份名称
@ApiModelProperty("所属城市编码")
private String cityCode; // 所属城市编码
@ApiModelProperty("所属城市名称")
private String cityName; // 所属城市名称
@ApiModelProperty("所属区县编码")
private String countyCode; // 所属区县编码
@ApiModelProperty("所属区县名称")
private String countyName; // 所属区县名称
@ApiModelProperty("区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区")
private String regionName; // 区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区
@ApiModelProperty("详细地址")
private String address; // 详细地址
@ApiModelProperty("库房面积")
private String acreage; // 库房面积
@ApiModelProperty("库房面积")
private String storeyHeight; // 库房面积
@ApiModelProperty("月租金")
private String monthlyPrice; // 月租金
@ApiModelProperty("库房性质编码组,多个性质以逗号(,)分隔")
private String attributeCodes; // 库房性质编码组,多个性质以逗号(,)分隔
@ApiModelProperty("库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房")
private String attributeNames; // 库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房
@ApiModelProperty("房源")
private String housingResource; // 房源
@ApiModelProperty("联系人姓名")
private String linkerName; // 联系人姓名
@ApiModelProperty("联系人电话")
private String linkerPhone; // 联系人电话
@ApiModelProperty("图片访问url")
private String picUrl; // 图片访问url
@ApiModelProperty("精度")
private String lon;
@ApiModelProperty("维度")
private String lat;
}
Loading…
Cancel
Save