From 387ba6085841fe6765827c57e4cb125d4af515ef Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 27 六月 2025 10:55:57 +0800
Subject: [PATCH] 2025-06-27 销售台账添加付款方式，新增开票时保存开票时间和录入人
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 12 ++++++++++++
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 5 +++++
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 4 +++-
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 1 +
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 2 ++
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 3 ++-
6 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 6d4861a..f4ce895 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -65,6 +65,7 @@
if (salesLedger.getId().intValue() == invoiceLedgerDto.getSalesLedgerId()) {
BigDecimal noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
+
}
}
}
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index c93e934..218bb01 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -42,4 +42,6 @@
@ApiModelProperty(value = "閿�鍞悎鍚孖D")
private Integer salesLedgerId;
+
+ private String paymentMethod;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index c9caf71..82d8b97 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -24,6 +25,17 @@
private String entryPerson;
private String remarks;
private String attachmentMaterials;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ @TableField(exist = false)
+ private String invoiceNo;
+ @TableField(exist = false)
+ private String createUser;
+
+
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
private List<String> tempFileIds;
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index bb576cc..3755e77 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
@@ -80,8 +81,12 @@
salesLedgerProductMapper.updateById(productDatum);
// 鏂板涓�鏉″紑绁ㄥ彴璐︽暟鎹�
InvoiceLedger invoiceLedger = new InvoiceLedger();
+ invoiceLedger.setInvoiceDate(salesLedgerDto.getIssueDate());
invoiceLedger.setInvoiceRegistrationProductId(invoiceRegistrationProduct.getId());
invoiceLedger.setInvoiceTotal(invoiceRegistrationProduct.getInvoiceAmount());
+ invoiceLedger.setInvoiceNo(salesLedgerDto.getInvoiceNo());
+ invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
+
invoiceLedgerMapper.insert(invoiceLedger);
}
}
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 03c9a18..7c0755d 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -20,7 +20,8 @@
sum(pr.tickets_amount)as receipt_payment_amount,
pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
pl.entry_date,
- pl.recorder_name
+ pl.recorder_name,
+ pl.payment_method
from purchase_ledger pl
left join product_record pr on pl.id = pr.purchase_ledger_id
<where>
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 64d50b0..139b1fb 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -30,6 +30,7 @@
T1.contract_amount,
T1.execution_date,
T2.nick_name AS entry_person_name
+ T1.payment_method
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -56,7 +57,8 @@
T1.tenant_id,
T1.contract_amount,
T1.execution_date,
- T2.nick_name AS entry_person_name
+ T2.nick_name AS entry_person_name,
+ T1.payment_method
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
--
Gitblit v1.9.3