From 128477234dfccf2b06b608b5569595607d9752cf Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 08 九月 2026 22:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 5 +----
1 files changed, 1 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..980b814 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,7 @@
if (purchaseLedger.getApprovalStatus() != null) {
queryWrapper.eq(PurchaseLedger::getApprovalStatus, purchaseLedger.getApprovalStatus());
}
+ queryWrapper.orderByDesc(PurchaseLedger::getEntryDate);
return purchaseLedgerMapper.selectList(queryWrapper);
}
@@ -162,10 +163,6 @@
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setApprovalStatus(1);
- // 鏂板鏃跺垵濮嬪寲瀹為檯鍚堝悓閲戦
- if (purchaseLedger.getId() == null) {
- purchaseLedger.setNetContractAmount(purchaseLedger.getContractAmount());
- }
// 3. 鏂板鎴栨洿鏂颁富琛�
if (purchaseLedger.getId() == null) {
if (!StringUtils.hasText(purchaseLedger.getPurchaseContractNumber())) {
--
Gitblit v1.9.3