From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
index aa7350a..5066177 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
@@ -62,8 +62,7 @@
reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime(), orderStatuses);
List<ErpPurchaseInvoiceDO> invoices = purchaseInvoiceMapper.selectListBySupplierIdAndInvoiceTimeBetween(
reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime());
- List<Integer> paymentStatuses = List.of(ErpAuditStatus.PROCESS.getStatus(),
- ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus());
+ List<Integer> paymentStatuses = List.of(ErpAuditStatus.APPROVE.getStatus());
List<ErpFinancePaymentDO> payments = financePaymentMapper.selectListBySupplierIdAndPaymentTimeBetween(
reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime(), paymentStatuses);
@@ -71,10 +70,10 @@
Map<Long, BigDecimal> invoicedMap = CollUtil.isEmpty(orders) ? Collections.emptyMap()
: purchaseInvoiceService.getPurchaseInvoicePriceSumMapByOrderIds(
orders.stream().map(ErpPurchaseOrderDO::getId).toList());
- // 4. 鏉ョエ宸蹭粯閲戦锛堟寜鎵�鏈夋湁鏁堜粯娆惧崟姹囨�伙級
+ // 4. 鏉ョエ宸蹭粯閲戦浠呮寜宸插鏍镐粯娆惧崟姹囨�伙紱瀹℃壒涓椤逛粛鍗犻搴︼紝浣嗗皻鏈疄闄呬粯娆俱��
Map<Long, BigDecimal> paidMap = CollUtil.isEmpty(invoices) ? Collections.emptyMap()
- : financePaymentMapper.selectPaymentPriceMapByInvoiceId(
- invoices.stream().map(ErpPurchaseInvoiceDO::getId).toList());
+ : financePaymentMapper.selectPaymentPriceMapByInvoiceIdAndStatus(
+ invoices.stream().map(ErpPurchaseInvoiceDO::getId).toList(), paymentStatuses);
// 5. 鏉ョエ鍏宠仈璁㈠崟鍙�
Set<Long> invoiceOrderIds = invoices.stream().map(ErpPurchaseInvoiceDO::getPurchaseOrderId)
.filter(Objects::nonNull).collect(Collectors.toSet());
@@ -161,7 +160,7 @@
@Override
public List<ErpSupplierStatementSummaryRespVO> getSupplierSummaryList(ErpSupplierStatementSummaryReqVO reqVO) {
- // 1. 鍙ｅ緞涓庡崟涓緵搴斿晢璇︽儏淇濇寔涓�鑷达細璁㈠崟鎸夊鏍哥姸鎬佽繃婊ゃ�佹潵绁ㄤ笉杩囨护鐘舵�併�佷粯娆惧惈鏈鏍�/瀹℃壒涓�/宸插鏍�
+ // 1. 鍙ｅ緞涓庡崟涓緵搴斿晢璇︽儏淇濇寔涓�鑷达細璁㈠崟鎸夊鏍哥姸鎬佽繃婊ゃ�佹潵绁ㄤ笉杩囨护鐘舵�併�佷粯娆惧彧璁″凡瀹℃牳銆�
List<Integer> orderStatuses = Boolean.TRUE.equals(reqVO.getIncludeUnapprovedOrder())
? List.of(ErpAuditStatus.PROCESS.getStatus(), ErpAuditStatus.APPROVING.getStatus(),
ErpAuditStatus.APPROVE.getStatus())
@@ -170,8 +169,7 @@
reqVO.getBeginTime(), reqVO.getEndTime(), orderStatuses);
List<ErpPurchaseInvoiceDO> invoices = purchaseInvoiceMapper.selectListByInvoiceTimeBetween(
reqVO.getBeginTime(), reqVO.getEndTime());
- List<Integer> paymentStatuses = List.of(ErpAuditStatus.PROCESS.getStatus(),
- ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus());
+ List<Integer> paymentStatuses = List.of(ErpAuditStatus.APPROVE.getStatus());
List<ErpFinancePaymentDO> payments = financePaymentMapper.selectListByPaymentTimeBetween(
reqVO.getBeginTime(), reqVO.getEndTime(), paymentStatuses);
--
Gitblit v1.9.3