Browse Source

供应商问题修改

采购申请调整
master
God 12 months ago
parent
commit
fa2b858a64
  1. 4
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java
  2. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
  3. 3
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
  4. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java
  5. 17
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java
  6. 89
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java
  7. 89
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java
  8. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java
  9. 29
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
  10. 30
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
  11. 30
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
  12. 35
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
  13. 42
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
  14. 41
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
  15. 30
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
  16. 38
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
  17. 97
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
  18. 34
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java
  19. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java
  20. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java
  21. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java
  22. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
  23. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
  24. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java
  25. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java
  26. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java
  27. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java
  28. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java
  29. 81
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java
  30. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java
  31. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java
  32. 60
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java
  33. 13
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml
  34. 81
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java
  35. 102
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java
  36. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java
  37. 80
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java
  38. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java
  39. 83
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java
  40. 60
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java
  41. 13
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml
  42. 79
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java
  43. 101
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java
  44. 81
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java
  45. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java
  46. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java
  47. 11
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
  48. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java

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

@ -66,9 +66,7 @@ public class BaseSupplierTypeRest {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseSupplierTypeDto dto){
ResultBean rb = ResultBean.fireFail();
baseSupplierTypeService.saveOrUpdateDto(dto);
return rb.success();
return baseSupplierTypeService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java

@ -56,6 +56,8 @@ public class BaseSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

3
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java

@ -97,9 +97,6 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<BaseSupplierBankDto> baseSupplierBankDtoList = dto.getBaseSupplierBankList();
if (baseSupplierBankDtoList == null || baseSupplierBankDtoList.size() == 0){
return rb.setMsg("开户行信息不能为空");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java

@ -57,4 +57,10 @@ public interface BaseSupplierTypeMapper extends BaseMapper<BaseSupplierType> {
@Select("select * from base_supplier_type")
List<BaseSupplierTypeVo> selectListVo();
@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid}")
int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid);
@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid} AND sid != #{dtoSid}")
int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid,@Param("dtoSid") String dtoSid);
}

17
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -60,13 +61,25 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
return p;
}
public void saveOrUpdateDto(BaseSupplierTypeDto dto){
public ResultBean saveOrUpdateDto(BaseSupplierTypeDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
String supplierTypeCode = dto.getSupplierTypeCode();
String createOrgSid = dto.getCreateOrgSid();
if (StringUtils.isBlank(dtoSid)) {
int i = baseMapper.checkSaveCode(supplierTypeCode,createOrgSid);
if (i > 0){
return rb.setMsg("新增编码已存在,请重新输入");
}
this.insertByDto(dto);
return;
return rb.success();
}
int i = baseMapper.checkUpdateCode(supplierTypeCode,createOrgSid,dtoSid);
if (i > 0){
return rb.setMsg("修改编码已存在,请重新输入");
}
this.updateByDto(dto);
return rb.success();
}
public void insertByDto(BaseSupplierTypeDto dto){

89
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java

@ -0,0 +1,89 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.apiadmin.pms;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceFeignFallback.java <br/>
* Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceRest <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "采购单-发票")
@RestController
@RequestMapping("v1/pmspurchasebillinvoice")
public class PmsPurchaseBillInvoiceRest {
@Autowired
private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<PmsPurchaseBillInvoiceVo>> listPage(@RequestBody PagerQuery<PmsPurchaseBillInvoiceQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<PmsPurchaseBillInvoiceVo> pv = pmsPurchaseBillInvoiceService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody PmsPurchaseBillInvoiceDto dto){
ResultBean rb = ResultBean.fireFail();
pmsPurchaseBillInvoiceService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
pmsPurchaseBillInvoiceService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<PmsPurchaseBillInvoiceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PmsPurchaseBillInvoiceDetailsVo vo = pmsPurchaseBillInvoiceService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

89
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java

@ -0,0 +1,89 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.apiadmin.pms;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.biz.pms.pmspurchasepay.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayFeignFallback.java <br/>
* Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayRest <br/>
* Description: 付款说明. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "付款说明")
@RestController
@RequestMapping("v1/pmspurchasepay")
public class PmsPurchasePayRest {
@Autowired
private PmsPurchasePayService pmsPurchasePayService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<PmsPurchasePayVo>> listPage(@RequestBody PagerQuery<PmsPurchasePayQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<PmsPurchasePayVo> pv = pmsPurchasePayService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody PmsPurchasePayDto dto){
ResultBean rb = ResultBean.fireFail();
pmsPurchasePayService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
pmsPurchasePayService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<PmsPurchasePayDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PmsPurchasePayDetailsVo vo = pmsPurchasePayService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

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

@ -68,9 +68,7 @@ public class PmsSupplierTypeRest {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody PmsSupplierTypeDto dto){
ResultBean rb = ResultBean.fireFail();
baseSupplierTypeService.saveOrUpdateDto(dto);
return rb.success();
return baseSupplierTypeService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")

29
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java

@ -26,12 +26,14 @@
package com.yxt.pms.biz.pms.pmspurchasebackbill;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购) <br/>
@ -74,9 +76,32 @@ public class PmsPurchasebackBill extends BaseEntity {
private String arrearsState;
@ApiModelProperty("单据状态")
private String documentState;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
}

30
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebackbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo;
@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -78,10 +80,34 @@ public class PmsPurchasebackBillDetailsVo implements Vo {
private String deductBillNo; // 抵扣单号
@ApiModelProperty("转入预付款")
private BigDecimal toPrepayment; // 转入预付款
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("采购退货单明细")
private List<PmsPurchasebackDetailDetailsVo> pmsPurchasebackDetailList;
}

30
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebackbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -77,10 +79,34 @@ public class PmsPurchasebackBillDto implements Dto {
private String deductBillNo; // 抵扣单号
@ApiModelProperty("转入预付款")
private BigDecimal toPrepayment; // 转入预付款
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("采购退货单明细")
private List<PmsPurchasebackDetailDto> pmsPurchasebackDetailList;

35
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java

@ -66,6 +66,18 @@ public class PmsPurchaseBill extends BaseEntity {
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
@ -88,9 +100,32 @@ public class PmsPurchaseBill extends BaseEntity {
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
}

42
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@ -33,6 +33,8 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -76,6 +78,18 @@ public class PmsPurchaseBillDetailsVo implements Vo {
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
@ -98,12 +112,36 @@ public class PmsPurchaseBillDetailsVo implements Vo {
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("付款信息")
private PmsPurchasePayDetailsVo purchasePay;
@ApiModelProperty("采购单商品明细")
private List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailList;
@ApiModelProperty("采购单扩展")
private PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtend;
}

41
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java

@ -31,6 +31,7 @@ import com.yxt.common.core.dto.Dto;
import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -74,6 +75,18 @@ public class PmsPurchaseBillDto implements Dto {
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
@ -96,12 +109,36 @@ public class PmsPurchaseBillDto implements Dto {
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("付款信息")
private PmsPurchasePayDto purchasePay;
@ApiModelProperty("采购单商品明细")
private List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList;
@ApiModelProperty("采购单扩展")
private PmsPurchaseBillExtendDto pmsPurchaseBillExtend;
}

30
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@ -5,19 +5,25 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillVo">
SELECT
pb.sid,
pb.billNo,
pb.createTime,
pb.createByName,
pb.supplierName,
pb.supplierPhone,
pb.storekeeperName,
IF(pb.settleState = 0, '未结算', '已结算') AS settleState,
pbs.settleTime
ppb.`sid`,
ppb.`nodeState`,
ppb.`createOrgName`,
ppb.`deptName`,
ppb.`createTime`,
ppb.`finishTime`,
ppb.`purchaseTypeValue`,
ppb.`purchaseReasonValue`,
ppb.`payTypeValue`,
ppb.`supplierName`,
IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
COUNT(ppbd.`amount`) AS amount,
ppb.`payableAmount`
FROM
pms_purchase_bill pb
LEFT JOIN pms_purchase_bill_settle pbs
ON pbs.`billSid` = pb.`sid`
pms_purchase_bill ppb
LEFT JOIN pms_purchase_bill_invoice ppbi
ON ppbi.`billSid` = ppb.`sid`
LEFT JOIN pms_purchase_bill_detail ppbd
ON ppbd.`billSid` = ppb.`sid`
<where> ${ew.sqlSegment} </where>
</select>

38
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购) <br/>
@ -51,22 +53,30 @@ import java.math.BigDecimal;
@ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
public class PmsPurchaseBillQuery implements Query {
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("创建开始日期")
private String createStartTime;
@ApiModelProperty("创建结束日期")
private String createEndTime;
@ApiModelProperty("门店sid")
private String createOrgSid;
@ApiModelProperty("票据类型key")
private String billTypeKey;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("结算状态(0未结算,1已结算)")
private String settleState;
@ApiModelProperty("欠款状态(0欠款,1未欠款)")
private String arrearsState;
@ApiModelProperty("单据状态(0未作废,1已作废)")
private String documentState;
@ApiModelProperty("其他查询条件")
private String otherQuery;
@ApiModelProperty("办结开始日期")
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("是否需要开发票(是1,否0)")
private String isInvoicing;
}

97
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@ -66,37 +66,46 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
@Autowired
private PmsPurchaseBillDetailService pmsPurchaseBillDetailService;
@Autowired
private PmsPurchaseBillExtendService pmsPurchaseBillExtendService;
public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) {
PmsPurchaseBillQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("pb.createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCreateOrgName())){
qw.like("ppb.createOrgSid",query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())){
qw.like("ppb.deptName",query.getDeptName());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
if (StringUtils.isNotBlank(query.getCreateByName())){
qw.like("ppb.createByName",query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("ppb.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getSettleState())){
qw.eq("pb.settleState",query.getSettleState());
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())){
qw.like("ppb.purchaseTypeValue",query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("pb.arrearsState",query.getArrearsState());
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())){
qw.like("ppb.purchaseReasonValue",query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("pb.documentState",query.getDocumentState());
if (StringUtils.isNotBlank(query.getPayTypeValue())){
qw.like("ppb.payTypeValue",query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("pb.remarks",query.getOtherQuery()));
if (StringUtils.isNotBlank(query.getSupplierName())){
qw.like("ppb.supplierName",query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getIsInvoicing())){
qw.eq("ppbi.isInvoicing",query.getIsInvoicing());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
);
IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillVo> pagging = baseMapper.selectPageVo(page, qw);
@ -107,26 +116,20 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
public String saveOrUpdateDto(PmsPurchaseBillDto dto){
String dtoSid = dto.getSid();
List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList = dto.getPmsPurchaseBillDetailList();
PmsPurchaseBillExtendDto pmsPurchaseBillExtend = dto.getPmsPurchaseBillExtend();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
pmsPurchaseBillDetailDto.setBillSid(sid);
pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
}
pmsPurchaseBillExtend.setPurchaseBillSid(sid);
pmsPurchaseBillExtendService.saveOrUpdateDto(pmsPurchaseBillExtend);
return sid;
}
this.updateByDto(dto);
pmsPurchaseBillDetailService.delByMainSid(dtoSid);
pmsPurchaseBillExtendService.delByMainSid(dtoSid);
for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
pmsPurchaseBillDetailDto.setBillSid(dtoSid);
pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
}
pmsPurchaseBillExtend.setPurchaseBillSid(dtoSid);
pmsPurchaseBillExtendService.saveOrUpdateDto(pmsPurchaseBillExtend);
return dtoSid;
}
@ -153,8 +156,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
BeanUtil.copyProperties(entity, vo);
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(sid);
vo.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtendDetailsVo = pmsPurchaseBillExtendService.selByMainSid(sid);
vo.setPmsPurchaseBillExtend(pmsPurchaseBillExtendDetailsVo);
return vo;
}
@ -162,7 +163,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
delBySids(sids);
for (String sid : sids) {
pmsPurchaseBillDetailService.delByMainSid(sid);
pmsPurchaseBillExtendService.delByMainSid(sid);
}
}
@ -173,31 +173,42 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
public List<PmsPurchaseBillExportVo> listExcel(PmsPurchaseBillQuery query) {
QueryWrapper<PmsPurchaseBillExportVo> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("pb.createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCreateOrgName())){
qw.like("ppb.createOrgSid",query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
if (StringUtils.isNotBlank(query.getDeptName())){
qw.like("ppb.deptName",query.getDeptName());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
if (StringUtils.isNotBlank(query.getCreateByName())){
qw.like("ppb.createByName",query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getSettleState())){
qw.eq("pb.settleState",query.getSettleState());
if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("ppb.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("pb.arrearsState",query.getArrearsState());
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())){
qw.like("ppb.purchaseTypeValue",query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("pb.documentState",query.getDocumentState());
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())){
qw.like("ppb.purchaseReasonValue",query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("pb.remarks",query.getOtherQuery()));
if (StringUtils.isNotBlank(query.getPayTypeValue())){
qw.like("ppb.payTypeValue",query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getSupplierName())){
qw.like("ppb.supplierName",query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getIsInvoicing())){
qw.eq("ppbi.isInvoicing",query.getIsInvoicing());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
);
}
List<PmsPurchaseBillExportVo> exportVoList = baseMapper.exportList(qw);

34
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java

@ -55,22 +55,32 @@ public class PmsPurchaseBillVo implements Vo {
private String sid; // sid
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("制单人姓名")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("供应商联系电话")
private String supplierPhone;
@ApiModelProperty("库管员姓名")
private String storekeeperName;
@ApiModelProperty("结算标志")
private String settleState;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("结算时间")
private Date settleTime;
@ApiModelProperty("是否需要开发票(是1,否0)")
private String isInvoicing;
@ApiModelProperty("采购金额合计")
private BigDecimal amountCount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java

@ -92,9 +92,4 @@ public class PmsPurchaseBillDetail extends BaseEntity {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java

@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailDetailsVo implements Vo {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java

@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailDto implements Dto {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java

@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailQuery implements Query {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java

@ -93,9 +93,5 @@ public class PmsPurchaseBillDetailVo implements Vo {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java

@ -64,8 +64,6 @@ public class PmsPurchaseBillExtend extends BaseEntity {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java

@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendDetailsVo implements Vo {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java

@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendDto implements Dto {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java

@ -63,8 +63,6 @@ public class PmsPurchaseBillExtendQuery implements Query {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java

@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendVo implements Vo {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

81
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoice.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoice <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票", description = "采购单-发票")
@TableName("pms_purchase_bill_invoice")
public class PmsPurchaseBillInvoice extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情")
public class PmsPurchaseBillInvoiceDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceDto.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto <br/>
* Description: 采购单-发票 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 数据传输对象", description = "采购单-发票 数据传输对象")
public class PmsPurchaseBillInvoiceDto implements Dto {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

60
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java

@ -0,0 +1,60 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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 java.util.List;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceMapper.java <br/>
* Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PmsPurchaseBillInvoiceMapper extends BaseMapper<PmsPurchaseBillInvoice> {
IPage<PmsPurchaseBillInvoiceVo> selectPageVo(IPage<PmsPurchaseBillInvoice> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchaseBillInvoice> qw);
List<PmsPurchaseBillInvoiceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchaseBillInvoice> qw);
@Select("select * from pms_purchase_bill_invoice")
List<PmsPurchaseBillInvoiceVo> selectListVo();
}

13
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
</select>
</mapper>

81
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceQuery.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceQuery <br/>
* Description: 采购单-发票 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 查询条件", description = "采购单-发票 查询条件")
public class PmsPurchaseBillInvoiceQuery implements Query {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDateStart; // 开票日期
private Date invoiceDateEnd; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

102
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java

@ -0,0 +1,102 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceService.java <br/>
* Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService <br/>
* Description: 采购单-发票 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchaseBillInvoiceMapper, PmsPurchaseBillInvoice> {
private QueryWrapper<PmsPurchaseBillInvoice> createQueryWrapper(PmsPurchaseBillInvoiceQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<PmsPurchaseBillInvoice> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<PmsPurchaseBillInvoiceVo> listPageVo(PagerQuery<PmsPurchaseBillInvoiceQuery> pq) {
PmsPurchaseBillInvoiceQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillInvoice> qw = createQueryWrapper(query);
IPage<PmsPurchaseBillInvoice> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillInvoiceVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchaseBillInvoiceVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsPurchaseBillInvoiceDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(PmsPurchaseBillInvoiceDto dto){
PmsPurchaseBillInvoice entity = new PmsPurchaseBillInvoice();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchaseBillInvoiceDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchaseBillInvoice entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public PmsPurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchaseBillInvoice entity = fetchBySid(sid);
PmsPurchaseBillInvoiceDetailsVo vo = new PmsPurchaseBillInvoiceDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据对象", description = "采购单-发票 视图数据对象")
public class PmsPurchaseBillInvoiceVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

80
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePay.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePay <br/>
* Description: 付款说明. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明", description = "付款说明")
@TableName("pms_purchase_pay")
public class PmsPurchasePay extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private String filePath; // 附件
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
* Description: 付款说明 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情")
public class PmsPurchasePayDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private List<String> filePath; // 附件
}

83
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayDto.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayDto <br/>
* Description: 付款说明 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 数据传输对象", description = "付款说明 数据传输对象")
public class PmsPurchasePayDto implements Dto {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private List<String> filePath = new ArrayList<>(); // 附件
}

60
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java

@ -0,0 +1,60 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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 java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayMapper.java <br/>
* Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayMapper <br/>
* Description: 付款说明. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PmsPurchasePayMapper extends BaseMapper<PmsPurchasePay> {
IPage<PmsPurchasePayVo> selectPageVo(IPage<PmsPurchasePay> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchasePay> qw);
List<PmsPurchasePayVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchasePay> qw);
@Select("select * from pms_purchase_pay")
List<PmsPurchasePayVo> selectListVo();
}

13
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayVo">
SELECT * FROM pms_purchase_pay <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayVo">
SELECT * FROM pms_purchase_pay <where> ${ew.sqlSegment} </where>
</select>
</mapper>

79
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java

@ -0,0 +1,79 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayQuery.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayQuery <br/>
* Description: 付款说明 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 查询条件", description = "付款说明 查询条件")
public class PmsPurchasePayQuery implements Query {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private String filePath; // 附件
}

101
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

@ -0,0 +1,101 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayService.java <br/>
* Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayService <br/>
* Description: 付款说明 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapper, PmsPurchasePay> {
private QueryWrapper<PmsPurchasePay> createQueryWrapper(PmsPurchasePayQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<PmsPurchasePay> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<PmsPurchasePayVo> listPageVo(PagerQuery<PmsPurchasePayQuery> pq) {
PmsPurchasePayQuery query = pq.getParams();
QueryWrapper<PmsPurchasePay> qw = createQueryWrapper(query);
IPage<PmsPurchasePay> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchasePayVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchasePayVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(PmsPurchasePayDto dto){
PmsPurchasePay entity = new PmsPurchasePay();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchasePay entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchasePay entity = fetchBySid(sid);
PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

81
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
* Description: 付款说明 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 视图数据对象", description = "付款说明 视图数据对象")
public class PmsPurchasePayVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private String filePath; // 附件
}

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java

@ -54,6 +54,8 @@ public class PmsSupplierInfoDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java

@ -55,6 +55,8 @@ public class PmsSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

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

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
@ -83,7 +84,8 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
return p;
}
public void saveOrUpdateDto(PmsSupplierTypeDto dto) {
public ResultBean saveOrUpdateDto(PmsSupplierTypeDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
@ -92,8 +94,11 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
dto.setUseOrgSid(createOrgSid);
BaseSupplierTypeDto baseSupplierTypeDto = new BaseSupplierTypeDto();
BeanUtil.copyProperties(dto,baseSupplierTypeDto);
baseSupplierTypeFeign.save(baseSupplierTypeDto);
return;
ResultBean resultBean = baseSupplierTypeFeign.save(baseSupplierTypeDto);
if (resultBean.getSuccess()) {
return rb.success();
}
return rb.setMsg(resultBean.getMsg());
}
public void del(String[] sids) {

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

@ -55,6 +55,8 @@ public class BaseSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

Loading…
Cancel
Save