From 5d33b3d530a98fd15e182102d658bf3ec17ca413 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 10 一月 2026 16:25:28 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 5 +++++
src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
index 38d57df..1f7fb9f 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java
@@ -51,7 +51,7 @@
SalesLedgerWorkDto salesLedgerSchedulingDto = new SalesLedgerWorkDto();
IPage<SalesLedgerWorkDto> result = salesLedgerWorkService.listPage(page,salesLedgerSchedulingDto);
result.getRecords().forEach(item -> {
- item.setDaiNum(item.getFinishedNum().subtract(item.getSchedulingNum()));
+ item.setDaiNum(item.getSchedulingNum().subtract(item.getFinishedNum()));
item.setStatusName(item.getStatus().toString());
});
ExcelUtil<SalesLedgerWorkDto> util = new ExcelUtil<>(SalesLedgerWorkDto.class);
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index 418397e..9ba8faa 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -22,6 +22,7 @@
import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
@@ -272,6 +273,8 @@
// 灏忎簬绛変簬0鍒犻櫎 锛屽ぇ浜�0淇敼
if(subtract.compareTo(BigDecimal.ZERO) <= 0){
ticketRegistrationMapper.deleteById(ticketRegistrations.get(0));
+ // 鍒犻櫎浠樻娴佹按
+ paymentRegistrationMapper.delete(new LambdaQueryWrapper<PaymentRegistration>().eq(PaymentRegistration::getTicketRegistrationId, ticketRegistrations.get(0).getId()));
}else if(subtract.compareTo(BigDecimal.ZERO) > 0){
ticketRegistrations.get(0).setInvoiceAmount(subtract);
ticketRegistrationMapper.updateById(ticketRegistrations.get(0));
@@ -284,6 +287,8 @@
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum()));
salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount()));
+ salesLedgerProduct.setTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(productRecord.getFutureTicketsAmount()));
+ salesLedgerProduct.setTicketsNum(salesLedgerProduct.getQuantity().subtract(productRecord.getFutureTickets()));
salesLedgerProductMapper.updateById(salesLedgerProduct);
}
--
Gitblit v1.9.3