From 6f9031ca27611c44b75264d7c236ff2454a60711 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 23 一月 2026 17:51:08 +0800
Subject: [PATCH] yys 发货管理修改
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 b303787..ddc3718 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -22,8 +22,10 @@
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;
@@ -61,13 +63,16 @@
@Autowired
private SalesQuotationMapper salesQuotationMapper;
+ @Autowired
+ private ShippingInfoMapper shippingInfoMapper;
+
public ApproveProcess getApproveById(String id) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveProcess::getApproveId, id);
queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
+// queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
queryWrapper.last("limit 1");
ApproveProcess one = approveProcessMapper.selectOne(queryWrapper);
return one;
@@ -102,14 +107,12 @@
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){
@@ -135,7 +138,6 @@
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
.eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
@@ -143,7 +145,6 @@
approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
.eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
.eq(ApproveNode::getDeleteFlag, 0)
- .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.last("limit 1");
ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
approveProcess.setApproveStatus(status);
@@ -180,8 +181,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){
@@ -204,7 +223,6 @@
sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
approveNode.getApproveProcessId()+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
- approveNode.getTenantId(),
"/collaborativeApproval/approvalProcess?approveType="+approveProcess.getApproveType()+"&approveId="+approveNode.getApproveProcessId());
}
break;
--
Gitblit v1.9.3