src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -333,7 +333,7 @@ LocalDateTime localDateTime = entryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); salesLedgerProduct.setRegisterDate(localDateTime); salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice()); salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice()); salesLedgerProductMapper.insert(salesLedgerProduct); } } src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -44,4 +44,10 @@ */ private Boolean status; /** * 供应商名称 */ @Excel(name = "供应商名称") private String supplierName; } src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -176,9 +176,19 @@ @Override @Transactional(rollbackFor = Exception.class) public int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct) { //未开票数量+金额 salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity()); salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice()); // 待回款，付款 if(salesLedgerProduct.getType().equals(1)){ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal())); //未开票数量+金额 salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity()); salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice()); }else{ salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getTicketsTotal())); // 未来票数量+金额 salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity()); salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice()); } int result; Long salesLedgerId = salesLedgerProduct.getSalesLedgerId(); if (salesLedgerProduct.getId() == null) { src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -680,7 +680,7 @@ salesLedgerProduct.setType(type); salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity()); salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice()); salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice()); salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice()); salesLedgerProductMapper.insert(salesLedgerProduct); ProductOrder productOrder = new ProductOrder(); src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -210,10 +210,7 @@ T4.customer_contract_no FROM receipt_payment T1 LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id LEFT JOIN sales_ledger T4 ON T1.sales_ledger_id = T4.id LEFT JOIN customer T5 ON T5.id = T4.customer_id <where> <if test="params.searchText != null and params.searchText != '' "> src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -67,9 +67,9 @@ <select id="listPagePurchaseLedger" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto"> select slp.*, sl.project_name, sl.customer_name, sl.supplier_name, sl.sales_contract_no, sl.customer_contract_no sl.purchase_contract_number from sales_ledger_product slp left join purchase_ledger sl on slp.sales_ledger_id = sl.id <where>
