From 766e3d9f03b6ff9c52a37d14d19304f9822d7c3d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 13:37:10 +0800
Subject: [PATCH] feat：销售台账-审核操作。新增的订单状态是未审核，审核人不能审核本人录入的订单。未审核的订单不能进行任何操作，只能修改、删除和审核
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index bd45dd2..0854853 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -812,6 +812,13 @@
if (CollectionUtils.isEmpty(idList)) {
return 0;
}
+ // 鏍￠獙锛氬凡瀹℃牳鐨勮鍗曚笉鑳藉垹闄�
+ List<SalesLedger> ledgers = salesLedgerMapper.selectBatchIds(idList);
+ for (SalesLedger ledger : ledgers) {
+ if (ledger.getReviewStatus() != null && ledger.getReviewStatus() == 1) {
+ throw new ServiceException("宸插鏍哥殑璁㈠崟涓嶈兘鍒犻櫎锛�" + ledger.getSalesContractNo());
+ }
+ }
// 鍒犻櫎閿�鍞鐞嗘暟鎹�
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList).select(SalesLedgerProduct::getId);
@@ -906,11 +913,25 @@
if (salesLedger.getDeliveryStatus() == 5) {
throw new ServiceException("璁㈠崟宸插彂璐�,绂佹缂栬緫");
}
+ // 鏌ヨ鏁版嵁搴撲腑鐨勫師濮嬭褰曠敤浜庢牎楠�
+ SalesLedger existingLedger = salesLedgerMapper.selectById(salesLedger.getId());
if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 1) {
+ // 瀹℃牳鎿嶄綔锛氭牎楠屽鏍镐汉涓嶈兘鏄綍鍏ヤ汉锛堜粎瀵规湭瀹℃牳鈫掑凡瀹℃牳鐨勮浆鎹級
+ if (existingLedger != null && existingLedger.getReviewStatus() != null && existingLedger.getReviewStatus() == 0) {
+ Long currentUserId = SecurityUtils.getUserId();
+ String entryPerson = existingLedger.getEntryPerson();
+ if (entryPerson != null && entryPerson.equals(String.valueOf(currentUserId))) {
+ throw new ServiceException("涓嶈兘瀹℃牳鏈汉褰曞叆鐨勮鍗�");
+ }
+ }
salesLedger.setReviewStatus(salesLedgerDto.getReviewStatus());
} else if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 2) {
handleCounterReview(salesLedger);
} else {
+ // 鏈鏍哥姸鎬佺殑缂栬緫鎿嶄綔锛氭牎楠屽凡瀹℃牳鐨勮鍗曚笉鑳界紪杈�
+ if (existingLedger != null && existingLedger.getReviewStatus() != null && existingLedger.getReviewStatus() == 1) {
+ throw new ServiceException("宸插鏍哥殑璁㈠崟涓嶈兘缂栬緫");
+ }
salesLedger.setReviewStatus(0);
}
salesLedgerMapper.updateById(salesLedger);
@@ -3402,7 +3423,7 @@
clearShippingAndApprovalRecords(originalSalesLedgerId);
// 9. 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
- cancelApproveProcesses(originalSalesLedgerId);
+ cancelApproveProcesses(originalSalesLedgerId, originalLedger.getSalesContractNo());
}
/**
@@ -3450,7 +3471,7 @@
/**
* 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
*/
- private void cancelApproveProcesses(Long originalSalesLedgerId) {
+ private void cancelApproveProcesses(Long originalSalesLedgerId, String originalSalesContractNo) {
// 鍙栨秷鍏ュ簱瀹℃壒娴佺▼
List<ApproveProcess> stockInApproveProcesses = approveProcessService.list(
new LambdaQueryWrapper<ApproveProcess>()
@@ -3469,7 +3490,7 @@
List<ApproveProcess> deliveryApproveProcesses = approveProcessService.list(
new LambdaQueryWrapper<ApproveProcess>()
.eq(ApproveProcess::getApproveType, 7) // 鍙戣揣瀹℃壒绫诲瀷
- .like(ApproveProcess::getApproveRemark, "{\"ledgerId\":" + originalSalesLedgerId)
+ .like(ApproveProcess::getApproveReason, "鍙戣揣瀹℃壒:" + originalSalesContractNo)
.eq(ApproveProcess::getApproveDelete, 0)
);
--
Gitblit v1.9.3