From 47b42159fbe69fb2b4dbc13c75dd45abd00a55ae Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 二月 2026 11:10:34 +0800
Subject: [PATCH] fix: 查询日期缺少时分秒
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
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 d1ec847..b2b5ad3 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,7 +12,10 @@
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto;
-import com.ruoyi.sales.mapper.*;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
+import com.ruoyi.sales.mapper.InvoiceRegistrationMapper;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceRegistration;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
@@ -85,18 +87,16 @@
throw new RuntimeException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪锛孖D锛�" + productDatum.getId());
}
- // 璁＄畻绱寮�绁�
- BigDecimal newInvoiceNum = dbProduct.getInvoiceNum().add(currentInvoiceNum);
+ // 鏈紑绁�
+ BigDecimal noInvoiceAmount = dbProduct.getNoInvoiceAmount();
+ BigDecimal noInvoiceNum = dbProduct.getNoInvoiceNum();
- BigDecimal newInvoiceAmount = dbProduct.getInvoiceAmount().add(currentInvoiceAmount);
+ // 鍓╀綑鏈紑绁�
+ BigDecimal newNoInvoiceNum = noInvoiceNum.subtract(currentInvoiceNum);
+ BigDecimal newNoInvoiceAmount = noInvoiceAmount.subtract(currentInvoiceAmount);
- // 璁＄畻鏈紑绁�
- BigDecimal newNoInvoiceNum = dbProduct.getQuantity().subtract(newInvoiceNum);
- BigDecimal newNoInvoiceAmount = dbProduct.getTaxInclusiveTotalPrice().subtract(newInvoiceAmount);
-
- if (newNoInvoiceNum.compareTo(BigDecimal.ZERO) < 0
- || newNoInvoiceAmount.compareTo(BigDecimal.ZERO) < 0) {
+ if (newNoInvoiceAmount.compareTo(BigDecimal.ZERO) < 0) {
throw new RuntimeException("寮�绁ㄦ暟閲忔垨閲戦瓒呰繃鍚堝悓鎬婚噺");
}
@@ -105,8 +105,6 @@
null,
new LambdaUpdateWrapper<SalesLedgerProduct>()
.eq(SalesLedgerProduct::getId, dbProduct.getId())
- .set(SalesLedgerProduct::getInvoiceNum, newInvoiceNum)
- .set(SalesLedgerProduct::getInvoiceAmount, newInvoiceAmount)
.set(SalesLedgerProduct::getNoInvoiceNum, newNoInvoiceNum)
.set(SalesLedgerProduct::getNoInvoiceAmount, newNoInvoiceAmount)
);
--
Gitblit v1.9.3