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/approve/service/impl/ApproveNodeServiceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 af042d4..70d9a1e 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.ApproveNodeMapper;
@@ -15,7 +14,6 @@
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.project.system.domain.SysUser;
@@ -40,6 +38,7 @@
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
+import com.ruoyi.sales.service.impl.SalesLedgerProductServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -72,6 +71,7 @@
private final QualityTestStandardMapper qualityTestStandardMapper;
private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
private final QualityInspectParamMapper qualityInspectParamMapper;
+ private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;
public ApproveProcess getApproveById(String id) {
@@ -167,11 +167,11 @@
approveProcessMapper.updateById(approveProcess);
//閲囪喘瀹℃牳
- if (approveProcess.getApproveType().equals(5)) {
+ if(approveProcess.getApproveType().equals(5)){
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
.eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason())
.last("limit 1"));
- if (purchaseLedger != null) {
+ if(purchaseLedger != null) {
if (status.equals(2)) {
// 鍚屾剰
purchaseLedger.setApprovalStatus(3);
@@ -180,8 +180,7 @@
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
// 璐ㄦ
if (salesLedgerProduct.getIsChecked()) {
- addQualityInspect(purchaseLedger, salesLedgerProduct);
- } else {
+ addQualityInspect(purchaseLedger, salesLedgerProduct); }else {
//鐩存帴鍏ュ簱
stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
}
@@ -197,41 +196,46 @@
}
}
// 閿�鍞姤浠风姸鎬佷慨鏀�
- if (approveProcess.getApproveType().equals(6)) {
+ if(approveProcess.getApproveType().equals(6)){
SalesQuotation salesQuote = salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>()
.eq(SalesQuotation::getQuotationNo, approveProcess.getApproveReason())
.last("limit 1"));
// 鍚屾剰
- if (status.equals(2) && salesQuote != null) {
+ if(status.equals(2) && salesQuote != null){
salesQuote.setStatus("閫氳繃");
- } else if (status.equals(3) && salesQuote != null) {
+ }else if(status.equals(3) && salesQuote != null){
salesQuote.setStatus("鎷掔粷");
- } else if (status.equals(1) && salesQuote != null) {
+ }else if(status.equals(1) && salesQuote != null){
salesQuote.setStatus("瀹℃牳涓�");
}
salesQuotationMapper.updateById(salesQuote);
}
// 鍑哄簱瀹℃壒淇敼
- if (approveProcess.getApproveType().equals(7)) {
+ 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)) {
+ if(shippingInfo != null){
+ if(status.equals(2)){
shippingInfo.setStatus("瀹℃牳閫氳繃");
- } else if (status.equals(3)) {
+ }else if(status.equals(3)){
shippingInfo.setStatus("瀹℃牳鎷掔粷");
- } else if (status.equals(1)) {
+ }else if(status.equals(1)){
shippingInfo.setStatus("瀹℃牳涓�");
}
shippingInfoMapper.updateById(shippingInfo);
}
}
+ if (approveProcess.getApproveType().equals(10)) {
+ //鐢熸垚鐢熶骇璁㈠崟
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new QueryWrapper<SalesLedgerProduct>().lambda().eq(SalesLedgerProduct::getSalesLedgerId, approveProcess.getRecordId()));
+ salesLedgerProducts.forEach(salesLedgerProductServiceImpl::addProductionData);
+ }
// 缁戝畾闄勪欢
- if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) {
+ if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
}
}
@@ -239,21 +243,21 @@
@Override
public void updateApproveNode(ApproveNode approveNode) throws IOException {
// 瀹℃壒鑺傜偣鐘舵��:1鍚屾剰锛�2鎷掔粷锛�0灏氭湭瀹℃牳
- switch (approveNode.getApproveNodeStatus()) {
+ switch (approveNode.getApproveNodeStatus()){
case 1:
updateApproveProcessStatus(approveNode, Boolean.TRUE.equals(approveNode.getIsLast()) ? 2 : 1);
/*娑堟伅閫氱煡*/
Integer nodeOrder = approveNode.getApproveNodeOrder();
ApproveProcess approveProcess = approveProcessMapper.selectList(Wrappers.<ApproveProcess>lambdaQuery()
.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())).get(0);
- if (approveProcess.getApproveUserIds().split(",").length > nodeOrder) {
+ if (approveProcess.getApproveUserIds().split(",").length > nodeOrder){
String id = approveProcess.getApproveUserIds().split(",")[nodeOrder];
- if (approveProcess.getApproveType() == 8) {
+ 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 {
+ }else {
sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
@@ -286,8 +290,8 @@
}
//瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
- private String approveProcessType(Integer approveType) {
- switch (approveType) {
+ private String approveProcessType(Integer approveType){
+ switch (approveType){
case 1:
return "鍏嚭绠＄悊";
case 2:
@@ -304,6 +308,8 @@
return "鍙戣揣瀹℃壒";
case 8:
return "鍗遍櫓浣滀笟瀹℃壒";
+ case 10:
+ return "閿�鍞鎵�";
}
return null;
}
--
Gitblit v1.9.3