From 443631aaeb3d4ccaaf1e3379c6850f6ad3df9241 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 14 八月 2025 11:22:12 +0800
Subject: [PATCH] 新增结算中和已结算无法修改数据
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 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 218fbc9..516d3e3 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,9 +1,18 @@
package com.ruoyi.cwgl.service.impl;
+import java.util.Date;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.cwgl.domain.EstimatedReceivableBillLog;
+import com.ruoyi.cwgl.domain.PendingSettlementBusiness;
+import com.ruoyi.cwgl.mapper.EstimatedReceivableMapper;
+import com.ruoyi.cwgl.mapper.PendingSettlementBusinessMapper;
+import com.ruoyi.cwgl.service.IEstimatedReceivableBillLogService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -33,6 +42,12 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private EstimatedReceivableBillMapper estimatedReceivableBillMapper;
+ @Autowired
+ private IEstimatedReceivableBillLogService logService;
+ @Resource
+ private PendingSettlementBusinessMapper pendingSettlementBusinessMapper;
+ @Resource
+ private EstimatedReceivableMapper estimatedReceivableMapper;
/**
@@ -179,4 +194,36 @@
{
return estimatedReceivableBillMapper.deleteEstimatedReceivableBillById(id);
}
+
+ @Override
+ public int settlement(EstimatedReceivableBill estimatedReceivableBill) {
+ Integer id = estimatedReceivableBill.getId();
+ EstimatedReceivableBill oldData = estimatedReceivableBillMapper.selectEstimatedReceivableBillById(id);
+ //搴旂粨绠楅噾棰�
+ Long totalAmount = oldData.getTotalAmount()==null?0L:oldData.getTotalAmount();
+ //宸茬粨绠楅噾棰�
+ Long settledAmount = oldData.getSettledAmount()==null?0L:oldData.getSettledAmount();
+ //褰撳墠鎻愪氦閲戦
+ Long settlementAmount = estimatedReceivableBill.getSettlementAmount();
+ EstimatedReceivableBillLog estimatedReceivableBillLog = new EstimatedReceivableBillLog();
+
+ estimatedReceivableBill.setSettledAmount(settlementAmount);
+ estimatedReceivableBillLog.setCreateTime(new Date());
+ estimatedReceivableBillLog.setBillId(estimatedReceivableBill.getId());
+ estimatedReceivableBillLog.setCreateBy(SecurityUtils.getUsername());
+ estimatedReceivableBillLog.setOperation("鏈鎻愪氦閲戦"+ settlementAmount);
+ logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
+ settledAmount = settledAmount+settlementAmount;
+ List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
+ if (settledAmount>totalAmount){
+ //宸茬粨绠楀ぇ浜庡簲璁＄畻閲戦涓哄凡缁撶畻
+ estimatedReceivableBill.setStatus(2);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
+ }else {
+ //鍚﹀垯閮ㄥ垎缁撶畻
+ estimatedReceivableBill.setStatus(1);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
+ }
+ return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
+ }
}
--
Gitblit v1.8.0