From f85d6c2edfb1a003c299c16b3a7509dbef9c9b2a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 24 三月 2026 12:20:59 +0800
Subject: [PATCH] 采购台账增加审批流程
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 543b24b..3598e44 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -440,9 +440,7 @@
//6.閿�鍞鍗曟寜绱ф�ョ▼搴﹀垎绫伙紝濡傛櫘閫氳鍗曚互鍙婄揣鎬ヨ鍗曪紱鏅�氳鍗曢渶娴佽浆鑷充笟鍔″崟鎹繘琛屽鎵癸紝绱ф�ヨ鍗曟棤闇�瀹℃壒銆�
if (salesLedger.getSalesType().equals("鏅��")){
- salesLedger.setIsPass(0);
- salesLedgerMapper.updateById(salesLedger);
- //骞朵笖鏂板瀹℃壒鏁版嵁approve_process
+ //鏂板瀹℃壒鏁版嵁approve_process
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveDeptId(salesLedger.getTenantId());
approveProcessVO.setApproveReason(salesLedger.getSalesContractNo());//瀹℃壒鐞嗙敱鏄攢鍞悎鍚屽彿鐢ㄨ繖涓潵鍏宠仈
@@ -450,12 +448,16 @@
approveProcessVO.setApproveTime(LocalDate.now().format(dateFormat));
approveProcessVO.setApproveType(6);//6鏄攢鍞彴璐�
approveProcessVO.setApproveUser(Long.parseLong(salesLedger.getEntryPerson()));//褰曞叆浜�=鐢宠浜�
- approveProcessVO.setApproveUserIds("1");
+ approveProcessVO.setApproveUserIds(salesLedgerDto.getApproveUserIds());//瀹℃壒浜�
try {
approveProcessService.addApprove(approveProcessVO);
} catch (Exception e) {
e.printStackTrace();
}
+ }else {
+ //绱ф�ラ粯璁ら�氳繃
+ salesLedger.setApprovalStatus(3);
+ salesLedgerMapper.updateById(salesLedger);
}
return 1;
} catch (IOException e) {
--
Gitblit v1.9.3