From dbaa984c77193d296a1a097fd7cf9e2e2bc45d8f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 15:34:05 +0800
Subject: [PATCH] fix(enum): 修正不合格新增库存
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 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 8efd5f2..5ff767c 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -19,11 +19,15 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
+import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesQuotation;
+import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +63,16 @@
private DeviceRepairMapper deviceRepairMapper;
@Autowired
+ private PurchaseLedgerMapper purchaseLedgerMapper;
+
+ @Autowired
private SalesQuotationMapper salesQuotationMapper;
+
+ @Autowired
+ private ShippingInfoMapper shippingInfoMapper;
+
+ @Autowired
+ private CommonFileServiceImpl commonFileService;
@@ -163,6 +176,26 @@
}
deviceRepairMapper.updateById(deviceRepair);
}
+
+ //閲囪喘瀹℃牳
+ if(approveProcess.getApproveType().equals(5)){
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
+ .eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason())
+ .last("limit 1"));
+ if(purchaseLedger != null) {
+ if (status.equals(2)) {
+ // 鍚屾剰
+ purchaseLedger.setApprovalStatus(3);
+ } else if (status.equals(3)) {
+ // 鎷掔粷
+ purchaseLedger.setApprovalStatus(4);
+ } else if (status.equals(1)) {
+ // 瀹℃牳涓�
+ purchaseLedger.setApprovalStatus(2);
+ }
+ purchaseLedgerMapper.updateById(purchaseLedger);
+ }
+ }
// 閿�鍞姤浠风姸鎬佷慨鏀�
if(approveProcess.getApproveType().equals(6)){
SalesQuotation salesQuote = salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>()
@@ -176,8 +209,26 @@
}else if(status.equals(1) && salesQuote != null){
salesQuote.setStatus("瀹℃牳涓�");
}
-
salesQuotationMapper.updateById(salesQuote);
+ }
+ // 鍑哄簱瀹℃壒淇敼
+ if(approveProcess.getApproveType().equals(7)){
+ String[] split = approveProcess.getApproveReason().split(":");
+ ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getShippingNo, split[1])
+ .orderByDesc(ShippingInfo::getCreateTime)
+ .last("limit 1"));
+ if(shippingInfo != null){
+ if(status.equals(2)){
+ shippingInfo.setStatus("瀹℃牳閫氳繃");
+ }else if(status.equals(3)){
+ shippingInfo.setType("瀹℃牳鎷掔粷");
+ }else if(status.equals(1)){
+ shippingInfo.setStatus("瀹℃牳涓�");
+ }
+ shippingInfoMapper.updateById(shippingInfo);
+ }
+
}
// 缁戝畾闄勪欢
if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
@@ -200,7 +251,6 @@
sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
approveNode.getApproveProcessId()+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
- approveNode.getTenantId(),
"/collaborativeApproval/approvalProcess?approveType="+approveProcess.getApproveType()+"&approveId="+approveNode.getApproveProcessId());
}
break;
@@ -215,11 +265,17 @@
}
@Override
- public void delApproveNodeByApproveId(Long id) {
+ public void delApproveNodeByApproveId(String id) {
+ List<ApproveNode> approveNodes = approveNodeMapper.selectList(new LambdaQueryWrapper<ApproveNode>()
+ .eq(ApproveNode::getApproveProcessId, id));
UpdateWrapper<ApproveNode> queryWrapper = new UpdateWrapper<>();
queryWrapper.lambda().set(ApproveNode::getDeleteFlag, 1)
.eq(ApproveNode::getApproveProcessId, id);
update(queryWrapper);
+ // 鍒犻櫎闄勪欢
+ for (ApproveNode approveNode : approveNodes) {
+ commonFileService.deleteByBusinessId(approveNode.getId(), FileNameType.ApproveNode.getValue());
+ }
}
//瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
--
Gitblit v1.9.3