From 74893f2cb7f6f1bbbc34cf2b34dc678dd054c54b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 26 六月 2026 17:03:48 +0800
Subject: [PATCH] fix(purchase): 修复采购台账查询逻辑 - 添加只查询入库已审批通过的采购台账条件
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 e1e6ffb..56c12f7 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -129,6 +129,9 @@
if (purchaseLedger.getApprovalStatus() != null) {
queryWrapper.eq(PurchaseLedger::getApprovalStatus, purchaseLedger.getApprovalStatus());
}
+ // 鍙煡璇㈠叆搴撳凡瀹℃壒閫氳繃鐨勯噰璐彴璐�
+ queryWrapper.inSql(PurchaseLedger::getId,
+ "SELECT DISTINCT record_id FROM stock_in_record WHERE approval_status = 1");
return purchaseLedgerMapper.selectList(queryWrapper);
}
@@ -162,10 +165,8 @@
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setApprovalStatus(1);
- // 鏂板鏃跺垵濮嬪寲瀹為檯鍚堝悓閲戦
- if (purchaseLedger.getId() == null) {
- purchaseLedger.setNetContractAmount(purchaseLedger.getContractAmount());
- }
+ // 瀹為檯鍚堝悓閲戦濮嬬粓绛変簬鍚堝悓閲戦
+ purchaseLedger.setNetContractAmount(purchaseLedger.getContractAmount());
// 3. 鏂板鎴栨洿鏂颁富琛�
if (purchaseLedger.getId() == null) {
if (!StringUtils.hasText(purchaseLedger.getPurchaseContractNumber())) {
@@ -945,6 +946,7 @@
salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
.map(PurchaseLedgerProductImportDto::getTaxInclusiveTotalPrice)
.reduce(BigDecimal.ZERO,BigDecimal::add));
+ salesLedger.setNetContractAmount(salesLedger.getContractAmount());
// 閫氳繃閿�鍞崟鍙风粦瀹氶攢鍞�
SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
.eq(SalesLedger::getSalesContractNo, salesLedger.getSalesContractNo())
--
Gitblit v1.9.3