From 74432331d7130a2d2798d0217ee9b688de55d811 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 27 八月 2025 17:55:30 +0800
Subject: [PATCH] 新增前后端
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 d422d8b..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
@@ -241,12 +241,12 @@
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);
@@ -273,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