From 6c95c2f6a3602fe6f92898dd322c20bbe955e69d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 18:03:20 +0800
Subject: [PATCH] feat: 成品入库增加审批环节,原材质检后提交入库时增加一个审批环节
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 294 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 275 insertions(+), 19 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 09c94a7..ee1d11d 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.approve.service.impl;
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;
@@ -10,24 +11,36 @@
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.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;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
-import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+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.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.SalesQuotation;
+import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.io.IOException;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Comparator;
@@ -35,7 +48,7 @@
import java.util.List;
@Service
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
public class ApproveNodeServiceImpl extends ServiceImpl<ApproveNodeMapper, ApproveNode> implements IApproveNodeService {
@Autowired
@@ -55,13 +68,44 @@
@Autowired
private DeviceRepairMapper deviceRepairMapper;
+ @Autowired
+ private PurchaseLedgerMapper purchaseLedgerMapper;
+
+ @Autowired
+ private SalesQuotationMapper salesQuotationMapper;
+
+ @Autowired
+ private ShippingInfoMapper shippingInfoMapper;
+
+ @Autowired
+ private CommonFileServiceImpl commonFileService;
+ @Autowired
+ private StockUtils stockUtils;
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ @Autowired
+ private PurchaseLedgerServiceImpl purchaseLedgerServiceImpl;
+
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+
+ @Autowired
+ @Lazy
+ private ShippingInfoService shippingInfoService;
+ @Autowired
+ @Lazy
+ private ISalesLedgerService salesLedgerService;
+ @Autowired
+ @Lazy
+ private IQualityInspectService qualityInspectService;
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;
@@ -70,14 +114,12 @@
@Override
public void initApproveNodes(String approveUserIds,String approveID,Long tenantId) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
- ApproveProcess approve = getApproveById(approveID);
String[] names = approveUserIds.split(",");
- String approveId = approve.getApproveId();
for (int i = 0; i < names.length; i++) {
SysUser sysUser = sysUserMapper.selectUserById(Long.parseLong(names[i]));
if (sysUser == null) continue;
ApproveNode approveNode = new ApproveNode();
- approveNode.setApproveProcessId(approveId);
+ approveNode.setApproveProcessId(approveID);
approveNode.setApproveNodeOrder(i +1);
approveNode.setApproveNodeUser(sysUser.getNickName());
approveNode.setApproveNodeUserId(sysUser.getUserId());
@@ -98,14 +140,14 @@
LambdaQueryWrapper<ApproveNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveNode::getApproveProcessId, id);
queryWrapper.eq(ApproveNode::getDeleteFlag, 0);
- queryWrapper.eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId());
+// 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::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+// .eq(ApproveProcess::getApproveStatus, 0)
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
if(approveProcess != null && approveProcess.getApproveStatus() == 3){
@@ -131,7 +173,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("瀹℃壒涓嶅瓨鍦�");
@@ -139,7 +180,7 @@
approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
.eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
.eq(ApproveNode::getDeleteFlag, 0)
- .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .eq(ApproveNode::getApproveNodeStatus, 0)
.last("limit 1");
ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
approveProcess.setApproveStatus(status);
@@ -163,9 +204,208 @@
}
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);
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new QueryWrapper<SalesLedgerProduct>()
+ .lambda().eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId()).eq(SalesLedgerProduct::getType, 2));
+ boolean hasCheckedProduct = false;
+ for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
+ // 璐ㄦ
+ if (salesLedgerProduct.getIsChecked()) {
+ hasCheckedProduct = true;
+ purchaseLedgerServiceImpl.addQualityInspect(purchaseLedger, salesLedgerProduct);
+ }else {
+ //鐩存帴鍏ュ簱
+ stockUtils.addStock(null, salesLedgerProduct.getId(), salesLedgerProduct.getProductModelId(),
+ salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), salesLedgerProduct.getId());
+ BigDecimal oldStocked = salesLedgerProduct.getStockedQuantity() == null ? BigDecimal.ZERO : salesLedgerProduct.getStockedQuantity();
+ BigDecimal orderQty = salesLedgerProduct.getQuantity() == null ? BigDecimal.ZERO : salesLedgerProduct.getQuantity();
+ BigDecimal newStocked = oldStocked.add(orderQty);
+ salesLedgerProduct.setStockedQuantity(newStocked);
+ salesLedgerProduct.setProductStockStatus(2);
+ salesLedgerProduct.fillRemainingQuantity();
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
+ }
+ }
+ purchaseLedger.setStockStatus(hasCheckedProduct ? 0 : 2);
+ } 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>()
+ .eq(SalesQuotation::getQuotationNo, approveProcess.getApproveReason())
+ .last("limit 1"));
+ // 鍚屾剰
+ if(status.equals(2) && salesQuote != null){
+ salesQuote.setStatus("閫氳繃");
+ }else if(status.equals(3) && salesQuote != null){
+ salesQuote.setStatus("鎷掔粷");
+ }else if(status.equals(1) && salesQuote != null){
+ salesQuote.setStatus("瀹℃牳涓�");
+ }
+ salesQuotationMapper.updateById(salesQuote);
+ }
+ // 鍑哄簱瀹℃壒淇敼 (璁㈠崟绾у埆)
+ if(approveProcess.getApproveType().equals(7)){
+ String[] split = approveProcess.getApproveReason().split(":");
+ if (split.length > 1) {
+ String identifier = split[1];
+ // 鏌ユ壘閿�鍞彴璐�
+ SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
+ .eq(SalesLedger::getSalesContractNo, identifier)
+ .last("limit 1"));
+
+ if (salesLedger != null) {
+ if(status.equals(2)){
+ // 瀹℃壒瀹屾垚 -> 淇敼鐘舵�佷负瀹℃牳閫氳繃锛屼笉鎵ｉ櫎搴撳瓨 (鎵ｉ櫎搴撳瓨绉昏嚦鍙戣揣鍙拌处琛ュ厖淇℃伅闃舵)
+ updateSalesLedgerDeliveryStatus(salesLedger.getId(), 4);
+ updateShippingInfoStatusByOrder(salesLedger.getId(), "瀹℃牳閫氳繃");
+ } else if(status.equals(3)){
+ updateSalesLedgerDeliveryStatus(salesLedger.getId(), 3);
+ // 鏇存柊鍏宠仈鐨勫彂璐ц褰曚负瀹℃牳鎷掔粷
+ updateShippingInfoStatusByOrder(salesLedger.getId(), "瀹℃牳鎷掔粷");
+ } else if(status.equals(1)){
+ updateSalesLedgerDeliveryStatus(salesLedger.getId(), 2);
+ updateShippingInfoStatusByOrder(salesLedger.getId(), "瀹℃牳涓�");
+ }
+ }
+ }
+ }
+
+ // 閿�鍞鍗曟垚鍝佸叆搴撳鎵�
+ if (approveProcess.getApproveType().equals(9)) {
+ String reason = approveProcess.getApproveReason();
+ // 閿�鍞牸寮忥細鍏ュ簱瀹℃壒:鍚堝悓鍙�:salesLedgerId:productId1,productId2
+ // 璐ㄦ鏍煎紡锛氬師鏉愭枡璐ㄦ鍏ュ簱瀹℃壒:inspectId:purchaseLedgerId
+ if (org.springframework.util.StringUtils.hasText(reason)) {
+ if (reason.startsWith("鍘熸潗鏂欒川妫�鍏ュ簱瀹℃壒:")) {
+ Integer inspectId = null;
+ String remark = approveProcess.getApproveRemark();
+ // 鏂伴�昏緫锛氫笟鍔″弬鏁版斁鍦� approveRemark
+ if (org.springframework.util.StringUtils.hasText(remark) && remark.startsWith("qualityQualifiedInbound:")) {
+ String[] split = remark.split(":");
+ if (split.length >= 2) {
+ inspectId = Integer.valueOf(split[1]);
+ }
+ }
+ if (inspectId == null) {
+ String[] split = reason.split(":");
+ if (split.length >= 2) {
+ inspectId = Integer.valueOf(split[1]);
+ }
+ }
+ if (inspectId != null) {
+ if (status.equals(2)) {
+ qualityInspectService.executeQualifiedInboundApproval(inspectId);
+ } else if (status.equals(3)) {
+ qualityInspectService.markQualifiedInboundApprovalStatus(inspectId, 4);
+ } else if (status.equals(1)) {
+ qualityInspectService.markQualifiedInboundApprovalStatus(inspectId, 2);
+ }
+ }
+ // 璐ㄦ瀹℃壒涓嶉渶瑕佺户缁蛋閿�鍞鍗曞叆搴�
+ return;
+ }
+ if (reason.startsWith("閿�鍞壂鐮佷笉鍚堟牸鍏ュ簱瀹℃壒:") || reason.startsWith("閿�鍞壂鐮佸悎鏍煎叆搴撳鎵�:")) {
+ String remark = approveProcess.getApproveRemark();
+ boolean qualified = reason.startsWith("閿�鍞壂鐮佸悎鏍煎叆搴撳鎵�:");
+ String prefix = qualified ? "scanQualified:" : "scanUnqualified:";
+ if (org.springframework.util.StringUtils.hasText(remark) && remark.startsWith(prefix)) {
+ String[] split = remark.split(":");
+ if (split.length >= 3) {
+ Long salesLedgerId = Long.valueOf(split[1]);
+ java.util.Map<Long, BigDecimal> inboundQtyByLineId = Arrays.stream(split[2].split(","))
+ .filter(org.springframework.util.StringUtils::hasText)
+ .map(s -> s.split("@"))
+ .filter(arr -> arr.length == 2)
+ .collect(java.util.stream.Collectors.toMap(
+ arr -> Long.valueOf(arr[0]),
+ arr -> new BigDecimal(arr[1]),
+ BigDecimal::add,
+ java.util.LinkedHashMap::new));
+ if (status.equals(2)) {
+ if (qualified) {
+ salesLedgerService.executeSalesScanInboundApproved(salesLedgerId, inboundQtyByLineId);
+ } else {
+ salesLedgerService.executeSalesScanInboundUnqualifiedApproved(salesLedgerId, inboundQtyByLineId);
+ }
+ }
+ }
+ }
+ return;
+ }
+ String[] split = reason.split(":");
+ Long salesLedgerId = null;
+ List<Long> productIds = null;
+ // 鍏ュ簱瀹℃壒鐞嗙敱鍙睍绀哄悎鍚屽彿 鍙傛暟鏀惧湪 approveRemark
+ if (reason.startsWith("鍏ュ簱瀹℃壒:")) {
+ String remark = approveProcess.getApproveRemark();
+ if (org.springframework.util.StringUtils.hasText(remark) && remark.startsWith("salesStock:")) {
+ String[] r = remark.split(":");
+ if (r.length >= 3) {
+ salesLedgerId = Long.valueOf(r[1]);
+ productIds = Arrays.stream(r[2].split(","))
+ .filter(org.springframework.util.StringUtils::hasText)
+ .map(Long::valueOf)
+ .collect(java.util.stream.Collectors.toList());
+ }
+ }
+ }
+ // 鍏ュ簱瀹℃壒:鍚堝悓鍙�:salesLedgerId:productId1,productId2
+ if (salesLedgerId == null && split.length >= 4) {
+ salesLedgerId = Long.valueOf(split[2]);
+ productIds = Arrays.stream(split[3].split(","))
+ .filter(org.springframework.util.StringUtils::hasText)
+ .map(Long::valueOf)
+ .collect(java.util.stream.Collectors.toList());
+ }
+
+ if (salesLedgerId != null && productIds != null) {
+
+ if (status.equals(2)) {
+ // 瀹℃壒閫氳繃鎵ц鍏ュ簱
+ salesLedgerService.executeSalesStockApproved(salesLedgerId, productIds);
+ }
+ }
+ }
+ }
+
// 缁戝畾闄勪欢
if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
+ }
+ }
+
+ private void updateShippingInfoStatusByOrder(Long salesLedgerId, String statusText) {
+ if (salesLedgerId == null) return;
+ shippingInfoMapper.update(null, new UpdateWrapper<ShippingInfo>()
+ .lambda()
+ .set(ShippingInfo::getStatus, statusText)
+ .eq(ShippingInfo::getSalesLedgerId, salesLedgerId));
+ }
+
+ private void updateSalesLedgerDeliveryStatus(Long salesLedgerId, Integer status) {
+ if (salesLedgerId == null) return;
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null) {
+ salesLedger.setDeliveryStatus(status);
+ salesLedgerMapper.updateById(salesLedger);
}
}
@@ -181,11 +421,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)),
- approveNode.getTenantId(),
- "/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:
@@ -199,11 +445,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());
+ }
}
//瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
@@ -222,7 +474,11 @@
case 6:
return "鎶ヤ环瀹℃壒";
case 7:
- return "鍑哄簱瀹℃壒";
+ return "鍙戣揣瀹℃壒";
+ case 8:
+ return "鍗遍櫓浣滀笟瀹℃壒";
+ case 9:
+ return "鍏ュ簱瀹℃壒";
}
return null;
}
--
Gitblit v1.9.3