From 62e7209401eb4732d9f5c64b81036c25b27710b3 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期四, 17 七月 2025 14:36:53 +0800 Subject: [PATCH] yys 修改销售管理bug --- src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml | 2 +- src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java index fe8bbc3..fa3c97d 100644 --- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java +++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java @@ -83,7 +83,7 @@ InvoiceRegistrationProduct invoiceRegistrationProduct = invoiceRegistrationProductMapper.selectById(productDto.getId()); SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId()); - BigDecimal invoiceNum = productDto.getInvoiceTotal().divide(invoiceRegistrationProduct.getTaxInclusiveTotalPrice(), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal invoiceNum = productDto.getInvoiceTotal().divide(invoiceRegistrationProduct.getTaxInclusiveUnitPrice(), 2, BigDecimal.ROUND_HALF_UP); //璁$畻 鏈紑绁ㄦ暟/鏈紑绁ㄩ噾棰� BigDecimal noInvoiceAmount = salesLedgerProduct.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()).subtract(productDto.getInvoiceTotal()); BigDecimal noInvoiceNum = salesLedgerProduct.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()).subtract(invoiceNum); diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml index e03ea6b..3178871 100644 --- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml +++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml @@ -95,7 +95,7 @@ T2.project_name FROM invoice_registration_product T1 LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id - LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id + RIGHT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id LEFT JOIN ( SELECT invoice_ledger_id, -- Gitblit v1.9.3