From 0594e539cbe8ac734377f148a87eb7812255ddc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 17:56:58 +0800
Subject: [PATCH] 审批代码迁移, 销售台账审批添加
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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 04554fd..905625e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -599,6 +599,12 @@
SalesLedger.class
);
}
+ //濡傛灉鏄洿鏂扮殑璇濋渶瑕佸垹闄ゅ鎵归噸鏂版坊鍔�
+ if (salesLedger.getId() != null) {
+ approveProcessService.deleteByRecordId(salesLedger.getId());
+ }
+ //娣诲姞瀹℃壒
+ submitApprove(salesLedger, salesLedger.getSalesContractNo(), SecurityUtils.getLoginUser());
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
if (salesLedgerDto.getTempFileIds() != null && !salesLedgerDto.getTempFileIds().isEmpty()) {
@@ -609,7 +615,20 @@
throw new BaseException("鏂囦欢杩佺Щ澶辫触: " + e.getMessage());
}
}
-
+ private void submitApprove(SalesLedger salesLedger, String customerNo, LoginUser loginUser) {
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(10);
+ approveProcessVO.setRecordId(salesLedger.getId());
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(customerNo);
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ try {
+ approveProcessService.addApprove(approveProcessVO);
+ }catch (Exception e){
+ throw new RuntimeException("瀹℃壒澶辫触");
+ }
+ }
/**
* 灏嗕复鏃舵枃浠惰縼绉诲埌姝ｅ紡鐩綍
*
@@ -712,20 +731,6 @@
salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
- //娣诲姞閿�鍞鎵� 瀹℃壒鎴愬姛涔嬪悗娣诲姞鐢熶骇鏁版嵁
- ApproveProcessVO approveProcessVO = new ApproveProcessVO();
- approveProcessVO.setApproveType(9);
- approveProcessVO.setApproveDeptId(SecurityUtils.getDeptId()[0]);
- approveProcessVO.setApproveReason(contractNo);
- approveProcessVO.setRecordId(salesLedgerProduct.getId());
- approveProcessVO.setApproveUser(SecurityUtils.getUserId());
- approveProcessVO.setApproveTime(LocalDate.now().toString());
- approveProcessVO.setApproveId(salesLedgerProduct.getId().toString());
- try {
- approveProcessService.addApprove(approveProcessVO);
- }catch (Exception e) {
- log.error("娣诲姞閿�鍞鎵瑰紓甯�", e);
- }
// 娣诲姞鐢熶骇鏁版嵁
// salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
--
Gitblit v1.9.3