From 4cceee2ced8d9ed1d8e8d08213372cc8a77ac601 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:24:54 +0800
Subject: [PATCH] yys 转移设备相关代码
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 6ac9d60..8da8e69 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -14,6 +14,8 @@
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.CommonFile;
@@ -41,6 +43,9 @@
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+
+ @Autowired
+ private PurchaseLedgerMapper purchaseLedgerMapper;
@Autowired
private SysUserMapper sysUserMapper;
@@ -142,15 +147,24 @@
approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
}
approveProcessMapper.updateById(approveProcess);
- //濡傛灉鏄�6閿�鍞鎵归�氳繃,瀵瑰簲閿�鍞叧鑱旂殑琛ㄩ渶瑕佹洿鏂�
- if (approveProcess.getApproveType()==6 && status==2){
+ //濡傛灉鏄�6閿�鍞鎵�,瀵瑰簲閿�鍞叧鑱旂殑琛ㄩ渶瑕佹洿鏂�
+ if (approveProcess.getApproveType()==6){
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(Wrappers.<SalesLedger>lambdaQuery().eq(SalesLedger::getSalesContractNo, approveProcess.getApproveReason()));
- if (CollectionUtils.isEmpty(salesLedgers)){
+ if (!CollectionUtils.isEmpty(salesLedgers)){
SalesLedger salesLedger = salesLedgers.get(0);
- salesLedger.setIsPass(1);
+ salesLedger.setApprovalStatus(status);
salesLedgerMapper.updateById(salesLedger);
}
}
+ //濡傛灉鏄�5閲囪喘瀹℃壒,瀵瑰簲閲囪喘鍏宠仈鐨勮〃闇�瑕佹洿鏂�
+ if (approveProcess.getApproveType()==5){
+ List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(Wrappers.<PurchaseLedger>lambdaQuery().eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason()));
+ if (!CollectionUtils.isEmpty(purchaseLedgers)){
+ PurchaseLedger purchaseLedger = purchaseLedgers.get(0);
+ purchaseLedger.setApprovalStatus(status);
+ purchaseLedgerMapper.updateById(purchaseLedger);
+ }
+ }
// 缁戝畾闄勪欢
if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
--
Gitblit v1.9.3