From 69f6a5c54eb608fb93d3a8638d4553ebed00f61d Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 15 八月 2025 10:59:34 +0800
Subject: [PATCH] 修改
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 516d3e3..60821c9 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
@@ -1,8 +1,10 @@
package com.ruoyi.cwgl.service.impl;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
@@ -144,6 +146,13 @@
public int updateEstimatedReceivableBill(EstimatedReceivableBill estimatedReceivableBill)
{
estimatedReceivableBill.setUpdateTime(DateUtils.getNowDate());
+ EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
+ estimatedReceivableBillLog.setCreateTime(new Date());
+ estimatedReceivableBillLog.setBillId(estimatedReceivableBill.getId());
+ estimatedReceivableBillLog.setCreateBy(SecurityUtils.getUsername());
+ estimatedReceivableBillLog.setOperation("淇敼璐﹀崟鍚嶇О涓�"+estimatedReceivableBill.getBillName());
+ logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
+ pendingSettlementBusinessMapper.updatePendingSettlementBusinessByBillId(estimatedReceivableBill.getId(),estimatedReceivableBill.getBillName());
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
@@ -226,4 +235,31 @@
}
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
+
+ @Override
+ public int cancelRelevancy(Integer id) {
+ PendingSettlementBusiness pendingSettlementBusiness = pendingSettlementBusinessMapper.selectPendingSettlementBusinessById(id);
+ if (pendingSettlementBusiness==null){
+ throw new ServiceException("寰呭叆璐︿笟鍔′笉瀛樺湪");
+ }
+ Integer billId = pendingSettlementBusiness.getBillId();
+ EstimatedReceivableBill estimatedReceivableBill = estimatedReceivableBillMapper.selectEstimatedReceivableBillById(billId);
+ estimatedReceivableBill.setDispatchCount(estimatedReceivableBill.getDispatchCount()-1);
+ //搴旂粨绠楅噾棰濅慨鏀�
+ Long totalAmount = estimatedReceivableBill.getTotalAmount();
+ estimatedReceivableBill.setTotalAmount(totalAmount-pendingSettlementBusiness.getEstimatedTotalIncome());
+ EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
+ estimatedReceivableBillLog.setCreateTime(new Date());
+ estimatedReceivableBillLog.setBillId(billId);
+ estimatedReceivableBillLog.setCreateBy(SecurityUtils.getUsername());
+ 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