From c5abfa28adf996a11cb83a5f7ba6c42f1109700d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 8 May 2024 13:42:49 +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 --- .../BaseSupplierInfoService.java | 15 +++-------- .../PmsPurchaseBillDetailsVo.java | 3 +++ .../pmspurchasebill/PmsPurchaseBillDto.java | 3 +++ .../PmsPurchaseBillService.java | 20 ++++++++++++++ .../PmsPurchaseBillInvoiceMapper.java | 4 +++ .../PmsPurchaseBillInvoiceService.java | 4 +++ .../PmsPurchasePayDetailsVo.java | 2 +- .../pms/pmspurchasepay/PmsPurchasePayDto.java | 2 +- .../pmspurchasepay/PmsPurchasePayMapper.java | 4 +++ .../pmspurchasepay/PmsPurchasePayService.java | 26 +++++++++++++++++++ .../PmsSupplierInfoService.java | 5 ++++ 11 files changed, 74 insertions(+), 14 deletions(-) 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 803e0c2348..f2acd0a841 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 @@ -106,19 +106,10 @@ public class BaseSupplierInfoService extends MybatisBaseService pmsPurchaseBillDetailList; } \ 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 f4211ae55f..1ed10a4295 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.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto; import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -139,6 +140,8 @@ public class PmsPurchaseBillDto implements Dto { @ApiModelProperty("付款信息") private PmsPurchasePayDto purchasePay; + @ApiModelProperty("发票信息") + private PmsPurchaseBillInvoiceDto purchaseBillInvoice; @ApiModelProperty("采购单商品明细") private List pmsPurchaseBillDetailList; } \ No newline at end of file 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 14fc89f57a..56d3452564 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 @@ -35,6 +35,10 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService; import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto; import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendService; +import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto; +import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService; +import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto; +import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -66,6 +70,10 @@ public class PmsPurchaseBillService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsPurchaseBillQuery query = pq.getParams(); @@ -115,9 +123,15 @@ public class PmsPurchaseBillService extends MybatisBaseService pmsPurchaseBillDetailList = dto.getPmsPurchaseBillDetailList(); if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto); + purchasePay.setBillSid(sid); + pmsPurchasePayService.saveOrUpdateDto(purchasePay); + purchaseBillInvoice.setBillSid(sid); + pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice); for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) { pmsPurchaseBillDetailDto.setBillSid(sid); pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto); @@ -126,6 +140,12 @@ public class PmsPurchaseBillService extends MybatisBaseService selectListVo(); + + @Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); } \ No newline at end of file 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 index 0f08bd8345..5712c1b7f4 100644 --- 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 @@ -99,4 +99,8 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService filePath; // 附件 + private List filePaths; // 附件 } \ 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 index 465dfd0d56..d2d84dff2e 100644 --- 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 @@ -78,6 +78,6 @@ public class PmsPurchasePayDto implements Dto { @ApiModelProperty("付款备注") private String payRemark; // 付款备注 @ApiModelProperty("附件") - private List filePath = new ArrayList<>(); // 附件 + private List filePaths = 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 index aa3864898e..082cb3155f 100644 --- 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 @@ -29,6 +29,7 @@ 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.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -57,4 +58,7 @@ public interface PmsPurchasePayMapper extends BaseMapper { @Select("select * from pms_purchase_pay") List selectListVo(); + + @Delete("delete from pms_purchase_pay where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); } \ No newline at end of file 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 index 9acd02c1c6..98df90f458 100644 --- 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 @@ -28,14 +28,18 @@ 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 com.yxt.common.base.config.component.FileUploadComponent; 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: yxt-pms(采购)
* File: PmsPurchasePayService.java
@@ -51,6 +55,10 @@ import org.springframework.stereotype.Service; */ @Service public class PmsPurchasePayService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + private QueryWrapper createQueryWrapper(PmsPurchasePayQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -79,6 +87,13 @@ public class PmsPurchasePayService extends MybatisBaseService filePaths = dto.getFilePaths(); + String url = ""; + for (String filePath : filePaths) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + entity.setFilePath(url); baseMapper.insert(entity); } @@ -89,6 +104,13 @@ public class PmsPurchasePayService extends MybatisBaseService filePaths = dto.getFilePaths(); + String url = ""; + for (String filePath : filePaths) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + entity.setFilePath(url); baseMapper.updateById(entity); } @@ -98,4 +120,8 @@ public class PmsPurchasePayService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + for (PmsSupplierInfoVo record : records) { + PmsSupplierInfo pmsSupplierInfo = fetchBySid(record.getSid()); + record.setAddress(pmsSupplierInfo.getProvince() + pmsSupplierInfo.getCity() + pmsSupplierInfo.getCounty() + record.getAddress()); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; }