From 7ec9b6c159fcb52b35910bca508ad730ab645267 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 17:19:51 +0800
Subject: [PATCH] feat(sales): 新增售后台账功能并优化发货流程
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 86 insertions(+), 18 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 4205818..2c36237 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -11,9 +11,9 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceRepair;
@@ -26,22 +26,15 @@
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.impl.PurchaseLedgerServiceImpl;
import com.ruoyi.sales.mapper.*;
-import com.ruoyi.sales.pojo.CommonFile;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.sales.pojo.SalesQuotation;
-import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Service
//@RequiredArgsConstructor
@@ -83,6 +76,9 @@
@Autowired
private PurchaseLedgerServiceImpl purchaseLedgerServiceImpl;
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+
public ApproveProcess getApproveById(String id) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
@@ -123,12 +119,14 @@
LambdaQueryWrapper<ApproveNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveNode::getApproveProcessId, id);
queryWrapper.eq(ApproveNode::getDeleteFlag, 0);
+// queryWrapper.eq(ApproveNode::getApproveNodeStatus, 0);
List<ApproveNode> list = list(queryWrapper);
// 鎸夌収 approveNodeOrder 瀛楁鍗囧簭鎺掑簭
list.sort(Comparator.comparingInt(ApproveNode::getApproveNodeOrder));
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, id)
.eq(ApproveProcess::getApproveDelete, 0)
+// .eq(ApproveProcess::getApproveStatus, 0)
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
if(approveProcess != null && approveProcess.getApproveStatus() == 3){
@@ -161,6 +159,7 @@
approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
.eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
.eq(ApproveNode::getDeleteFlag, 0)
+ .eq(ApproveNode::getApproveNodeStatus, 0)
.last("limit 1");
ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
approveProcess.setApproveStatus(status);
@@ -202,7 +201,7 @@
purchaseLedgerServiceImpl.addQualityInspect(purchaseLedger, salesLedgerProduct);
}else {
//鐩存帴鍏ュ簱
- stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
+ stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
}
}
} else if (status.equals(3)) {
@@ -230,6 +229,28 @@
}
salesQuotationMapper.updateById(salesQuote);
}
+
+
+ //閿�鍞鎵�
+ if(approveProcess.getApproveType().equals(9)){
+ SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
+ .eq(SalesLedger::getSalesContractNo, approveProcess.getApproveReason())
+ .last("limit 1"));
+ if(salesLedger != null) {
+ if (status.equals(2)) {
+ // 鍚屾剰
+ salesLedger.setApprovalStatus(3);
+ } else if (status.equals(3)) {
+ // 鎷掔粷
+ salesLedger.setApprovalStatus(4);
+ } else if (status.equals(1)) {
+ // 瀹℃牳涓�
+ salesLedger.setApprovalStatus(2);
+ }
+ salesLedgerMapper.updateById(salesLedger);
+ }
+ }
+
// 鍑哄簱瀹℃壒淇敼
if(approveProcess.getApproveType().equals(7)){
String[] split = approveProcess.getApproveReason().split(":");
@@ -267,10 +288,17 @@
.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())).get(0);
if (approveProcess.getApproveUserIds().split(",").length > nodeOrder){
String id = approveProcess.getApproveUserIds().split(",")[nodeOrder];
- sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
- approveNode.getApproveProcessId()+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType="+approveProcess.getApproveType()+"&approveId="+approveNode.getApproveProcessId());
+ if (approveProcess.getApproveType()==8){
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ "/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
+ }else {
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
+ }
}
break;
case 2:
@@ -284,7 +312,7 @@
}
@Override
- public void delApproveNodeByApproveId(String id) {
+ public void delApproveNodeByApproveId(Long id) {
List<ApproveNode> approveNodes = approveNodeMapper.selectList(new LambdaQueryWrapper<ApproveNode>()
.eq(ApproveNode::getApproveProcessId, id));
UpdateWrapper<ApproveNode> queryWrapper = new UpdateWrapper<>();
@@ -295,6 +323,40 @@
for (ApproveNode approveNode : approveNodes) {
commonFileService.deleteByBusinessId(approveNode.getId(), FileNameType.ApproveNode.getValue());
}
+ }
+
+ @Override
+ public List<ApproveNode> salesDetails(String id) {
+ LambdaQueryWrapper<ApproveNode> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ApproveNode::getApproveProcessId, id);
+ queryWrapper.eq(ApproveNode::getDeleteFlag, 0);
+// queryWrapper.eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId());
+ List<ApproveNode> list = list(queryWrapper);
+ // 鎸夌収 approveNodeOrder 瀛楁鍗囧簭鎺掑簭
+ list.sort(Comparator.comparingInt(ApproveNode::getApproveNodeOrder));
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, id)
+ .eq(ApproveProcess::getApproveDelete, 0)
+// .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .last("limit 1");
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
+ if(approveProcess != null && approveProcess.getApproveStatus() == 3){
+ return list;
+ }
+ for (ApproveNode approveNode : list) {
+ List<CommonFile> commonFiles = fileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, approveNode.getId())
+ .eq(CommonFile::getType, FileNameType.ApproveNode.getValue()));
+ if(!CollectionUtils.isEmpty(commonFiles)){
+ approveNode.setUrl(commonFiles.get(0).getUrl());
+ }
+ if(approveNode.getApproveNodeStatus() == 1){
+ continue;
+ }
+ approveNode.setIsShen(true);
+ break;
+ }
+ return list;
}
//瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
@@ -313,7 +375,13 @@
case 6:
return "鎶ヤ环瀹℃壒";
case 7:
- return "鍑哄簱瀹℃壒";
+ return "鍙戣揣瀹℃壒";
+ case 8:
+ return "鍗遍櫓浣滀笟瀹℃壒";
+ case 9:
+ return "閿�鍞鎵�";
+ case 10:
+ return "鑷敱鍗忓悓瀹℃壒";
}
return null;
}
--
Gitblit v1.9.3