Browse Source

供应商类型调整

zhanglei
God 1 year ago
parent
commit
dd0ed14ae0
  1. 2
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java
  2. 10
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java
  3. 14
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java
  4. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml
  5. 103
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
  6. 77
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierBankDto.java
  7. 116
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java
  8. 19
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoFeign.java
  9. 62
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java
  10. 20
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeFeign.java

2
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java

@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "供应商类型")
@RestController
@RequestMapping("/apiadmin/base/basesuppliertype")
@RequestMapping("v1/basesuppliertype")
public class BaseSupplierTypeRest {
@Autowired

10
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java

@ -75,15 +75,7 @@ public class PmsSupplierTypeRest {
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseSupplierTypeService.delBySids(sids);
baseSupplierTypeService.del(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<PmsSupplierTypeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PmsSupplierTypeDetailsVo vo = baseSupplierTypeService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

14
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java

@ -29,9 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.*;
import java.util.List;
@ -51,10 +49,8 @@ import java.util.List;
@Mapper
public interface PmsSupplierTypeMapper extends BaseMapper<PmsSupplierType> {
IPage<PmsSupplierTypeVo> selectPageVo(IPage<PmsSupplierType> page, @Param(Constants.WRAPPER) Wrapper<PmsSupplierType> qw);
List<PmsSupplierTypeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsSupplierType> qw);
@Select("select * from yxt_base.base_supplier_type")
List<PmsSupplierTypeVo> selectListVo();
IPage<PmsSupplierTypeVo> selectPageVo(IPage<PmsSupplierType> page, @Param(Constants.WRAPPER) Wrapper<PmsSupplierType> qw);
@Delete("delete from yxt_base.base_supplier_type where sid = #{sid}")
void del(String sid);
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml

@ -6,8 +6,4 @@
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmssuppliertype.PmsSupplierTypeVo">
SELECT * FROM yxt_base.base_supplier_type <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmssuppliertype.PmsSupplierTypeVo">
SELECT * FROM yxt_base.base_supplier_type <where> ${ew.sqlSegment} </where>
</select>
</mapper>

103
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java

@ -35,6 +35,8 @@ import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierTypeDto;
import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierTypeFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,63 +57,46 @@ import org.springframework.stereotype.Service;
@Service
public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMapper, PmsSupplierType> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<PmsSupplierTypeVo> listPageVo(PagerQuery<PmsSupplierTypeQuery> pq) {
PmsSupplierTypeQuery query = pq.getParams();
QueryWrapper<PmsSupplierType> qw = new QueryWrapper<>();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
if (StringUtils.isNotBlank(query.getSupplierTypeName())){
qw.like("supplierTypeName",query.getSupplierTypeName());
}
if (StringUtils.isNotBlank(query.getSupplierTypeCode())){
qw.like("supplierTypeCode",query.getSupplierTypeCode());
}
qw.eq("createOrgSid",createOrgSid);
IPage<PmsSupplierType> page = PagerUtil.queryToPage(pq);
IPage<PmsSupplierTypeVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsSupplierTypeVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsSupplierTypeDto dto){
String dtoSid = dto.getSid();
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(sysOrganizationVo.getName());
dto.setUseOrgSid(createOrgSid);
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(PmsSupplierTypeDto dto){
PmsSupplierType entity = new PmsSupplierType();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(PmsSupplierTypeDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsSupplierType entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public PmsSupplierTypeDetailsVo fetchDetailsVoBySid(String sid){
PmsSupplierType entity = fetchBySid(sid);
PmsSupplierTypeDetailsVo vo = new PmsSupplierTypeDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BaseSupplierTypeFeign baseSupplierTypeFeign;
public PagerVo<PmsSupplierTypeVo> listPageVo(PagerQuery<PmsSupplierTypeQuery> pq) {
PmsSupplierTypeQuery query = pq.getParams();
QueryWrapper<PmsSupplierType> qw = new QueryWrapper<>();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
if (StringUtils.isNotBlank(query.getSupplierTypeName())) {
qw.like("supplierTypeName", query.getSupplierTypeName());
}
if (StringUtils.isNotBlank(query.getSupplierTypeCode())) {
qw.like("supplierTypeCode", query.getSupplierTypeCode());
}
qw.eq("createOrgSid", createOrgSid);
IPage<PmsSupplierType> page = PagerUtil.queryToPage(pq);
IPage<PmsSupplierTypeVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsSupplierTypeVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsSupplierTypeDto dto) {
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
dto.setCreateOrgSid(createOrgSid);
dto.setCreateOrgName(sysOrganizationVo.getName());
dto.setUseOrgSid(createOrgSid);
BaseSupplierTypeDto baseSupplierTypeDto = new BaseSupplierTypeDto();
BeanUtil.copyProperties(dto,baseSupplierTypeDto);
baseSupplierTypeFeign.save(baseSupplierTypeDto);
return;
}
public void del(String[] sids) {
for (String sid : sids) {
baseMapper.del(sid);
}
}
}

77
yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierBankDto.java

@ -0,0 +1,77 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.feign.yxtbase.supplier;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-base(供应商管理) <br/>
* File: BaseSupplierBankDto.java <br/>
* Class: com.yxt.base.api.basesupplierbank.BaseSupplierBankDto <br/>
* Description: 供应商开户行信息 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-18 13:33:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "供应商开户行信息 数据传输对象", description = "供应商开户行信息 数据传输对象")
public class BaseSupplierBankDto implements Dto {
private String sid; // sid
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("开户行帐号")
private String bankAccount; // 开户行帐号
@ApiModelProperty("账户名称")
private String accountName; // 账户名称
@ApiModelProperty("账户类型key")
private String dueBankKey; // 账户类型key
@ApiModelProperty("账户类型value")
private String dueBankValue; // 账户类型value
@ApiModelProperty("银行网点")
private String bankingOutlets; // 银行网点
@ApiModelProperty("开户行地址")
private String bankAddress; // 开户行地址
@ApiModelProperty("联行号")
private String paymentLines; // 联行号
@ApiModelProperty("银行代码")
private String swiftCode; // 银行代码
@ApiModelProperty("币种")
private String currency; // 币种
}

116
yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java

@ -0,0 +1,116 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.feign.yxtbase.supplier;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: yxt-base(供应商管理) <br/>
* File: BaseSupplierInfoDto.java <br/>
* Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoDto <br/>
* Description: 供应商信息 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-18 13:33:13 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象")
public class BaseSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("供应商名称拼音")
private String supplierPY; // 供应商名称拼音
@ApiModelProperty("供应商类型sid")
private String supplierTypeSid; // 供应商类型sid
@ApiModelProperty("供应商类型")
private String supplierTypeName; // 供应商类型
@ApiModelProperty("省sid")
private String provinceSid; // 省sid
@ApiModelProperty("province")
private String province; //
@ApiModelProperty("市sid")
private String citySid; // 市sid
@ApiModelProperty("city")
private String city; //
@ApiModelProperty("收货县区sid")
private String countySid; // 收货县区sid
@ApiModelProperty("county")
private String county; //
@ApiModelProperty("详细地址")
private String address; // 详细地址
@ApiModelProperty("手机")
private String contactMobile; // 手机
@ApiModelProperty("电话")
private String contactTelePhone; // 电话
@ApiModelProperty("联系人")
private String contactName; // 联系人
@ApiModelProperty("传真")
private String fax; // 传真
@ApiModelProperty("邮编")
private String zipCode; // 邮编
@ApiModelProperty("电子邮件")
private String email; // 电子邮件
@ApiModelProperty("网址")
private String website; // 网址
@ApiModelProperty("开票公司名称")
private String billingCompanyName; // 开票公司名称
@ApiModelProperty("税号")
private String registNum; // 税号
@ApiModelProperty("法人")
private String legalName; // 法人
@ApiModelProperty("采购员")
private String purchaser; // 采购员
@ApiModelProperty("排序")
private Integer sortNo; // 排序
@ApiModelProperty("开票类型key")
private String billingTypeKey; // 开票类型key
@ApiModelProperty("开票类型value")
private String billingTypeValue; // 开票类型value
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("开户行信息")
private List<BaseSupplierBankDto> baseSupplierBankList;
}

19
yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoFeign.java

@ -0,0 +1,19 @@
package com.yxt.pms.feign.yxtbase.supplier;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@Api(tags = "供应商信息")
@FeignClient(
contextId = "yxt-base-BaseSupplierInfo",
name = "yxt-base",
path = "v1/basesupplierinfo")
public interface BaseSupplierInfoFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseSupplierInfoDto dto);
}

62
yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java

@ -0,0 +1,62 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.feign.yxtbase.supplier;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-base(仓储基础信息供应商) <br/>
* File: BaseSupplierTypeDto.java <br/>
* Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeDto <br/>
* Description: 供应商类型 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-13 16:51:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "供应商类型 数据传输对象", description = "供应商类型 数据传输对象")
public class BaseSupplierTypeDto implements Dto {
private String sid; // sid
@ApiModelProperty("供应商类型名称")
private String supplierTypeName; // 供应商类型名称
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
}

20
yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeFeign.java

@ -0,0 +1,20 @@
package com.yxt.pms.feign.yxtbase.supplier;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@Api(tags = "供应商类型")
@FeignClient(
contextId = "yxt-base-BaseSupplierType",
name = "yxt-base",
path = "v1/basesuppliertype")
public interface BaseSupplierTypeFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseSupplierTypeDto dto);
}
Loading…
Cancel
Save