From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填，有时候可能不含税
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e5a64fd..a55e55f 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -27,6 +27,7 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
@@ -34,6 +35,7 @@
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
+import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
@@ -172,7 +174,7 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
+ handleSalesLedgerProducts(purchaseLedgerDto,purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
}
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -183,7 +185,9 @@
return 1;
}
- private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
+ private final ITicketRegistrationService ticketRegistrationService;
+
+ private void handleSalesLedgerProducts(PurchaseLedgerDto purchaseLedgerDto,Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) throws IOException {
if (products == null || products.isEmpty()) {
throw new BaseException("浜у搧淇℃伅涓嶅瓨鍦�");
}
@@ -252,6 +256,26 @@
salesLedgerProduct.setRegisterDate(localDateTime);
salesLedgerProductMapper.insert(salesLedgerProduct);
}
+ if (purchaseLedgerDto.getIsInvoice().equals(2)) {
+ // 鏃犻渶寮�绁紝鎻愮ず绯荤粺鐢熸垚鍙戠エ
+
+ for (SalesLedgerProduct productDatum : insertList) {
+ productDatum.setTicketsAmount(productDatum.getTaxInclusiveTotalPrice());
+ productDatum.setTicketsNum(productDatum.getQuantity());
+ }
+ BigDecimal invoiceAmount = insertList.stream()
+ .map(SalesLedgerProduct::getTicketsAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ TicketRegistrationDto ticketRegistrationDto = new TicketRegistrationDto();
+ BeanUtils.copyProperties(purchaseLedgerDto, ticketRegistrationDto);
+ ticketRegistrationDto.setInvoiceAmount(invoiceAmount);
+ ticketRegistrationDto.setProductData(insertList);
+ ticketRegistrationDto.setPurchaseLedgerId(salesLedgerId);
+ ticketRegistrationDto.setIssUer("绯荤粺鑷姩鐢熸垚");
+ ticketRegistrationDto.setIssueDate(LocalDate.now());
+ ticketRegistrationDto.setInvoiceNumber("姝ゅ彴璐︽棤闇�鎵嬪姩寮�绁紝绯荤粺灏嗘墍鏈変骇鍝佽嚜鍔ㄧ敓鎴愭潵绁ㄥ彴璐�");
+ ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto);
+ }
}
// 璁＄畻鎬诲惈绋庨噾棰�
--
Gitblit v1.9.3