From e18e4614ec036b8fa6f130f51fd19e24280a51d0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 02 六月 2026 13:20:21 +0800
Subject: [PATCH] 修改发货审批
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 6 +++---
1 files changed, 3 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..1b590bc 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -3402,7 +3402,7 @@
clearShippingAndApprovalRecords(originalSalesLedgerId);
// 9. 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
- cancelApproveProcesses(originalSalesLedgerId);
+ cancelApproveProcesses(originalSalesLedgerId, originalLedger.getSalesContractNo());
}
/**
@@ -3450,7 +3450,7 @@
/**
* 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
*/
- private void cancelApproveProcesses(Long originalSalesLedgerId) {
+ private void cancelApproveProcesses(Long originalSalesLedgerId, String originalSalesContractNo) {
// 鍙栨秷鍏ュ簱瀹℃壒娴佺▼
List<ApproveProcess> stockInApproveProcesses = approveProcessService.list(
new LambdaQueryWrapper<ApproveProcess>()
@@ -3469,7 +3469,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