From c0f6fb84a98db212b0780f44430d4e0cdf1b0302 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 10 九月 2025 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
index 2b0ab09..82746c1 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
@@ -160,6 +160,7 @@
estimatedReceivableBillLog.setOperation("淇敼璐﹀崟鍚嶇О涓�"+estimatedReceivableBill.getBillName());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
pendingSettlementBusinessMapper.updatePendingSettlementBusinessByBillId(estimatedReceivableBill.getId(),estimatedReceivableBill.getBillName());
+
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
@@ -230,17 +231,26 @@
estimatedReceivableBillLog.setOperation("鏈鎻愪氦閲戦"+ settlementAmount);
estimatedReceivableBillLog.setFileName(estimatedReceivableBill.getAttachment());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
- settledAmount = settledAmount.add(settlementAmount);
+
List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
- if (settledAmount.compareTo(totalAmount) > 0){
+ // 妫�鏌ュ綋鍓嶆彁浜ら噾棰�+宸茬粨绠楅噾棰濇槸鍚﹁秴杩囧簲缁撶畻閲戦
+ if (settlementAmount.add(settledAmount).compareTo(totalAmount) > 0) {
+ // 瓒呰繃搴旂粨绠楅噾棰濓紝鎶涘嚭寮傚父鎴栧鐞嗛敊璇�
+ throw new RuntimeException("褰撳墠鎻愪氦閲戦鍔犱笂宸茬粨绠楅噾棰濅笉鑳借秴杩囧簲缁撶畻閲戦");
+ }
+ if (settlementAmount.add(settledAmount).compareTo(totalAmount) == 0) {
//宸茬粨绠楀ぇ浜庡簲璁＄畻閲戦涓哄凡缁撶畻
estimatedReceivableBill.setStatus(2);
- estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3,null);
+ pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
}else {
//鍚﹀垯閮ㄥ垎缁撶畻
estimatedReceivableBill.setStatus(1);
- estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2,null);
+ pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
}
+ settledAmount = settledAmount.add(settlementAmount);
+ estimatedReceivableBill.setSettledAmount(settledAmount);
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
@@ -263,9 +273,7 @@
String dispatchNo = pendingSettlementBusiness.getDispatchNo();
estimatedReceivableBillLog.setOperation("鍙栨秷璋冨害鍗�"+ dispatchNo +"鍏宠仈");
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
- List<String> dispatchNos = new ArrayList<>();
- dispatchNos.add(dispatchNo);
- estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,0);
+
return pendingSettlementBusinessMapper.cancelRelevancy(id);
--
Gitblit v1.8.0