From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
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 0cd6e56..9ec44e8 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.enums.FileNameType;
+import com.ruoyi.common.enums.SalesLedgerType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -13,6 +15,7 @@
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
+import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
@@ -26,6 +29,8 @@
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
+import com.ruoyi.sales.service.impl.SalesLedgerProductServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
@@ -71,6 +76,9 @@
private final TempFileMapper tempFileMapper;
private final ProductRecordMapper productRecordMapper;
+
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
@Autowired
private PaymentRegistrationMapper paymentRegistrationMapper;
@@ -276,8 +284,8 @@
queryWrapper.like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getPurchaseContractNumber())
.like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierName());
}
- if (!ObjectUtils.isEmpty(ticketRegistration.getIssueDateStart())&&!ObjectUtils.isEmpty(ticketRegistration.getIssueDateEnd())) {
- queryWrapper.between(TicketRegistration::getIssueDate,LocalDate.parse(ticketRegistration.getIssueDateStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd")), LocalDate.parse(ticketRegistration.getIssueDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ if (!ObjectUtils.isEmpty(ticketRegistration.getIssueDateStart()) && !ObjectUtils.isEmpty(ticketRegistration.getIssueDateEnd())) {
+ queryWrapper.between(TicketRegistration::getIssueDate, LocalDate.parse(ticketRegistration.getIssueDateStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd")), LocalDate.parse(ticketRegistration.getIssueDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
IPage<TicketRegistration> ticketRegistrationIPage = ticketRegistrationMapper.selectPage(page, queryWrapper);
// 璁＄畻宸蹭粯娆鹃噾棰�
@@ -305,6 +313,23 @@
}
}
return ticketRegistrationIPage;
+ }
+
+ @Override
+ public PurchaseLedgerDto getPuargeById(Long id) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
+ PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
+ BeanUtils.copyProperties(purchaseLedger, purchaseLedgerDto);
+ SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
+ salesLedgerProduct.setSalesLedgerId(id);
+ salesLedgerProduct.setType(SalesLedgerType.SALES_LEDGER_TYPE_SALES_LEDGER.getValue());
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
+ purchaseLedgerDto.setProductData(salesLedgerProducts);
+ List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getType, FileNameType.PURCHASELEDGER.getValue())
+ .eq(CommonFile::getCommonId, id));
+ purchaseLedgerDto.setSalesLedgerFiles(commonFiles);
+ return purchaseLedgerDto;
}
private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
@@ -339,16 +364,17 @@
}
// 璁＄畻 futureTickets锛堢洿鎺ヤ娇鐢� BigDecimal 璁＄畻锛岄伩鍏嶇簿搴︿涪澶憋級
- product.setFutureTickets(
- product.getQuantity()
- .subtract(product.getTicketsNum())
- );
+// product.setFutureTickets(
+// product.getQuantity()
+// .subtract(product.getTicketsNum())
+// );
+
// 璁＄畻 futureTicketsAmount
- product.setFutureTicketsAmount(
- product.getTaxInclusiveTotalPrice()
- .subtract(product.getTicketsAmount())
- );
+// product.setFutureTicketsAmount(
+// product.getTaxInclusiveTotalPrice()
+// .subtract(product.getTicketsAmount())
+// );
product.setType(type);
salesLedgerProductMapper.updateById(product);
});
--
Gitblit v1.9.3