src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/sales/SalesLedgerMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); } } } src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -42,4 +42,6 @@ @ApiModelProperty(value = "销售合同ID") private Integer salesLedgerId; private String paymentMethod; } 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; 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); } } 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> 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