From fa2b858a64c7be6e07780955ec448d9629f98400 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 8 May 2024 11:12:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/base/BaseSupplierTypeRest.java | 4 +- .../basesupplierinfo/BaseSupplierInfoDto.java | 2 + .../BaseSupplierInfoService.java | 3 - .../BaseSupplierTypeMapper.java | 6 ++ .../BaseSupplierTypeService.java | 23 +++- .../pms/PmsPurchaseBillInvoiceRest.java | 89 +++++++++++++++ .../pms/apiadmin/pms/PmsPurchasePayRest.java | 89 +++++++++++++++ .../pms/apiadmin/pms/PmsSupplierTypeRest.java | 4 +- .../PmsPurchasebackBill.java | 33 +++++- .../PmsPurchasebackBillDetailsVo.java | 34 +++++- .../PmsPurchasebackBillDto.java | 34 +++++- .../pms/pmspurchasebill/PmsPurchaseBill.java | 35 ++++++ .../PmsPurchaseBillDetailsVo.java | 46 +++++++- .../pmspurchasebill/PmsPurchaseBillDto.java | 47 +++++++- .../pmspurchasebill/PmsPurchaseBillMapper.xml | 30 +++--- .../pmspurchasebill/PmsPurchaseBillQuery.java | 38 ++++--- .../PmsPurchaseBillService.java | 97 +++++++++-------- .../pmspurchasebill/PmsPurchaseBillVo.java | 34 +++--- .../PmsPurchaseBillDetail.java | 5 - .../PmsPurchaseBillDetailDetailsVo.java | 5 - .../PmsPurchaseBillDetailDto.java | 5 - .../PmsPurchaseBillDetailQuery.java | 5 - .../PmsPurchaseBillDetailVo.java | 4 - .../PmsPurchaseBillExtend.java | 2 - .../PmsPurchaseBillExtendDetailsVo.java | 2 - .../PmsPurchaseBillExtendDto.java | 2 - .../PmsPurchaseBillExtendQuery.java | 2 - .../PmsPurchaseBillExtendVo.java | 2 - .../PmsPurchaseBillInvoice.java | 81 ++++++++++++++ .../PmsPurchaseBillInvoiceDetailsVo.java | 82 ++++++++++++++ .../PmsPurchaseBillInvoiceDto.java | 82 ++++++++++++++ .../PmsPurchaseBillInvoiceMapper.java | 60 +++++++++++ .../PmsPurchaseBillInvoiceMapper.xml | 13 +++ .../PmsPurchaseBillInvoiceQuery.java | 81 ++++++++++++++ .../PmsPurchaseBillInvoiceService.java | 102 ++++++++++++++++++ .../PmsPurchaseBillInvoiceVo.java | 82 ++++++++++++++ .../pms/pmspurchasepay/PmsPurchasePay.java | 80 ++++++++++++++ .../PmsPurchasePayDetailsVo.java | 82 ++++++++++++++ .../pms/pmspurchasepay/PmsPurchasePayDto.java | 83 ++++++++++++++ .../pmspurchasepay/PmsPurchasePayMapper.java | 60 +++++++++++ .../pmspurchasepay/PmsPurchasePayMapper.xml | 13 +++ .../pmspurchasepay/PmsPurchasePayQuery.java | 79 ++++++++++++++ .../pmspurchasepay/PmsPurchasePayService.java | 101 +++++++++++++++++ .../pms/pmspurchasepay/PmsPurchasePayVo.java | 81 ++++++++++++++ .../PmsSupplierInfoDetailsVo.java | 2 + .../pmssupplierinfo/PmsSupplierInfoDto.java | 2 + .../PmsSupplierTypeService.java | 11 +- .../yxtbase/supplier/BaseSupplierInfoDto.java | 2 + 48 files changed, 1708 insertions(+), 153 deletions(-) create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java index 95eb003876..5edde730a2 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java +++ b/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批量删除") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java index 534d65fa78..6d7e01404f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java +++ b/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("供应商名称") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java index 20dcce80a1..803e0c2348 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java @@ -97,9 +97,6 @@ public class BaseSupplierInfoService extends MybatisBaseService 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) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java index 5365445fed..4aab553793 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java @@ -57,4 +57,10 @@ public interface BaseSupplierTypeMapper extends BaseMapper { @Select("select * from base_supplier_type") List 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); } \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java index 8c5a38e400..04edda83de 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java +++ b/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 0){ + return rb.setMsg("新增编码已存在，请重新输入"); + } + this.insertByDto(dto); + 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){ diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java new file mode 100644 index 0000000000..88fab3fcfd --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceFeignFallback.java
+ * Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceRest
+ * Description: 采购单-发票.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @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> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PmsPurchaseBillInvoiceDetailsVo vo = pmsPurchaseBillInvoiceService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java new file mode 100644 index 0000000000..ae021104d3 --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayFeignFallback.java
+ * Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayRest
+ * Description: 付款说明.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @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> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PmsPurchasePayDetailsVo vo = pmsPurchasePayService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java index aea17241d2..b14f7649a5 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java +++ b/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批量删除") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java index c746e0e1f3..5ecc2ffba7 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java +++ b/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(采购)
@@ -74,9 +76,32 @@ public class PmsPurchasebackBill extends BaseEntity { private String arrearsState; @ApiModelProperty("单据状态") private String documentState; - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + + @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; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java index c29bc9f642..8ebc1aa5d0 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java +++ b/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 useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + + @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 List pmsPurchasebackDetailList; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java index c8c6752bf4..c682afcda0 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java +++ b/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 useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + + @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 List pmsPurchasebackDetailList; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java index 7c4a845f47..2a16e69552 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java +++ b/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; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java index 94654c19df..2970ed6ba4 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java +++ b/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") + + @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("创建组织sid") + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; + + @ApiModelProperty("付款信息") + private PmsPurchasePayDetailsVo purchasePay; @ApiModelProperty("采购单商品明细") private List pmsPurchaseBillDetailList; - @ApiModelProperty("采购单扩展") - private PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtend; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java index d2cf2e575f..f4211ae55f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java +++ b/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,7 +75,19 @@ public class PmsPurchaseBillDto implements Dto { private String purchaseTypeKey; @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") private String purchaseTypeValue; - @ApiModelProperty("供应商sid") + + @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("供应商名称") private String supplierName; @@ -96,12 +109,36 @@ public class PmsPurchaseBillDto implements Dto { private BigDecimal discountAmount; @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）") private BigDecimal payableAmount; - @ApiModelProperty("使用组织sid") + + @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("创建组织sid") + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; + + @ApiModelProperty("付款信息") + private PmsPurchasePayDto purchasePay; @ApiModelProperty("采购单商品明细") private List pmsPurchaseBillDetailList; - @ApiModelProperty("采购单扩展") - private PmsPurchaseBillExtendDto pmsPurchaseBillExtend; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml index 3ec9ee5bf2..49881c9999 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml @@ -5,19 +5,25 @@ diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java index 3552ec1cad..64b3dec237 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java +++ b/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(采购)
@@ -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; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 160152bc9d..14fc89f57a 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -66,37 +66,46 @@ public class PmsPurchaseBillService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsPurchaseBillQuery query = pq.getParams(); QueryWrapper 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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -107,26 +116,20 @@ public class PmsPurchaseBillService extends MybatisBaseService 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 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 listExcel(PmsPurchaseBillQuery query) { QueryWrapper 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 exportVoList = baseMapper.exportList(qw); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java index dbd1504259..565849118d 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java +++ b/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; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java index 31ab513f7a..cfb597bee0 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java +++ b/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; // 最低零售价 - } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java index 1a35a5121b..914ac0e1c3 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java +++ b/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; // 最低零售价 - } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java index 529da00155..41edebe01f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java +++ b/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; // 最低零售价 - } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java index 4d4077c76d..35d2a7e587 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java +++ b/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; // 最低零售价 - } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java index 74f1b7f425..c545ea93f4 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java +++ b/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; // 最低零售价 } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java index 896e1c5a54..ad63b0511e 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java +++ b/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("发货人手机") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java index be5a05d964..eef8400fdb 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java +++ b/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("发货人手机") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java index 69ac54d7f3..31dda42ec1 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java +++ b/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("发货人手机") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java index 44fc863bf3..e0838c00ad 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java +++ b/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("发货人手机") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java index fef51e2088..1c5cbb5cbe 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java +++ b/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("发货人手机") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java new file mode 100644 index 0000000000..3ffc2d78c5 --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoice.java
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoice
+ * Description: 采购单-发票.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @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; // 税率 + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java new file mode 100644 index 0000000000..4714f83f56 --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceVo.java
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo
+ * Description: 采购单-发票 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @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; // 税率 + +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java new file mode 100644 index 0000000000..9317ba14cd --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceDto.java
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto
+ * Description: 采购单-发票 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @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; // 税率 + +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java new file mode 100644 index 0000000000..901b1482e7 --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceMapper.java
+ * Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper
+ * Description: 采购单-发票.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PmsPurchaseBillInvoiceMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from pms_purchase_bill_invoice") + List selectListVo(); +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml new file mode 100644 index 0000000000..d96db5e95e --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java new file mode 100644 index 0000000000..76b988b306 --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceQuery.java
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceQuery
+ * Description: 采购单-发票 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @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; // 税率 + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java new file mode 100644 index 0000000000..0f08bd8345 --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceService.java
+ * Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService
+ * Description: 采购单-发票 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PmsPurchaseBillInvoiceService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(PmsPurchaseBillInvoiceQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PmsPurchaseBillInvoiceQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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; + } +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java new file mode 100644 index 0000000000..814da338ab --- /dev/null +++ b/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(采购发票)
+ * File: PmsPurchaseBillInvoiceVo.java
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo
+ * Description: 采购单-发票 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @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; // 税率 + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java new file mode 100644 index 0000000000..0b92949955 --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePay.java
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePay
+ * Description: 付款说明.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @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; // 附件 + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java new file mode 100644 index 0000000000..4af959a843 --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayVo.java
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo
+ * Description: 付款说明 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @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 filePath; // 附件 + +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java new file mode 100644 index 0000000000..465dfd0d56 --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayDto.java
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayDto
+ * Description: 付款说明 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @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 filePath = new ArrayList<>(); // 附件 + +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java new file mode 100644 index 0000000000..aa3864898e --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayMapper.java
+ * Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayMapper
+ * Description: 付款说明.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PmsPurchasePayMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from pms_purchase_pay") + List selectListVo(); +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml new file mode 100644 index 0000000000..686fb9d8df --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java new file mode 100644 index 0000000000..f26854ec48 --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayQuery.java
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayQuery
+ * Description: 付款说明 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @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; // 附件 + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java new file mode 100644 index 0000000000..9acd02c1c6 --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayService.java
+ * Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayService
+ * Description: 付款说明 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PmsPurchasePayService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(PmsPurchasePayQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PmsPurchasePayQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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; + } +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java new file mode 100644 index 0000000000..06b573b59f --- /dev/null +++ b/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(采购)
+ * File: PmsPurchasePayVo.java
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo
+ * Description: 付款说明 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @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; // 附件 + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java index 19bb07efa1..d8ea31acd4 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java +++ b/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("供应商名称") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java index f42a54f830..bcf92d84c0 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java +++ b/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("供应商名称") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java index 8811636989..952184e283 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java +++ b/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