From 5ed564bddc6aecb049509d9524190b3704f87d3d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 17 八月 2026 22:10:20 +0800
Subject: [PATCH] fix: 供应商与客户往来修改
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index ec8bb26..9d4a705 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.basic.mapper.SupplierManageMapper;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.common.utils.AmountUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
@@ -171,6 +172,7 @@
vo.setShippedAmount(BigDecimal.ZERO);
BigDecimal contractAmount = vo.getContractAmounts() == null ? BigDecimal.ZERO : vo.getContractAmounts();
vo.setUnshippedAmount(contractAmount);
+ AmountUtils.normalizeSupplierTransaction(vo);
}
return plPage;
}
@@ -184,7 +186,7 @@
// 涓嶈川妫�鐩存帴鍏ュ簱鐨� - 7
List<StockInRecord> directInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
.eq(StockInRecord::getRecordType, "7")
- .eq(StockInRecord::getApprovalStatus, 1)
+ .in(StockInRecord::getApprovalStatus, 0, 1)
.in(StockInRecord::getRecordId, ledgerIds));
// 閫氳繃璐ㄦ鍏ュ簱鐨�
@@ -198,7 +200,7 @@
if (!inspectIds.isEmpty()) {
qualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
.eq(StockInRecord::getRecordType, "10")
- .eq(StockInRecord::getApprovalStatus, 1)
+ .in(StockInRecord::getApprovalStatus, 0, 1)
.in(StockInRecord::getRecordId, inspectIds));
qualityUnqualifieds = qualityUnqualifiedMapper.selectList(new LambdaQueryWrapper<QualityUnqualified>()
@@ -211,7 +213,7 @@
if (!unqualifiedIds.isEmpty()) {
unqualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
.eq(StockInRecord::getRecordType, "11")
- .eq(StockInRecord::getApprovalStatus, 1)
+ .in(StockInRecord::getApprovalStatus, 0, 1)
.in(StockInRecord::getRecordId, unqualifiedIds));
}
@@ -261,6 +263,7 @@
}
vo.setShippedAmount(shippedAmount);
vo.setUnshippedAmount(contractAmount.subtract(shippedAmount));
+ AmountUtils.normalizeSupplierTransaction(vo);
}
return plPage;
@@ -284,7 +287,7 @@
// 涓嶈川妫�鐩存帴鍏ュ簱鐨� - 7
List<StockInRecord> directInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
.eq(StockInRecord::getRecordType, "7")
- .eq(StockInRecord::getApprovalStatus, 1)
+ .in(StockInRecord::getApprovalStatus, 0, 1)
.in(StockInRecord::getRecordId, ledgerIds));
// 閫氳繃璐ㄦ鍏ュ簱鐨�
@@ -298,7 +301,7 @@
if (!inspectIds.isEmpty()) {
qualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
.eq(StockInRecord::getRecordType, "10")
- .eq(StockInRecord::getApprovalStatus, 1)
+ .in(StockInRecord::getApprovalStatus, 0, 1)
.in(StockInRecord::getRecordId, inspectIds));
qualityUnqualifieds = qualityUnqualifiedMapper.selectList(new LambdaQueryWrapper<QualityUnqualified>()
@@ -311,7 +314,7 @@
if (!unqualifiedIds.isEmpty()) {
unqualifiedInboundRecords = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
.eq(StockInRecord::getRecordType, "11")
- .eq(StockInRecord::getApprovalStatus, 1)
+ .in(StockInRecord::getApprovalStatus, 0, 1)
.in(StockInRecord::getRecordId, unqualifiedIds));
}
@@ -356,6 +359,7 @@
}
vo.setShippedAmount(shippedAmount);
vo.setUnshippedAmount(contractAmount.subtract(shippedAmount));
+ AmountUtils.normalizeSupplierTransactionDetail(vo);
}
return plPage;
--
Gitblit v1.9.3