From 86079d1c2bd7981165487e6e08d2399b80687f6e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 14:21:49 +0800
Subject: [PATCH] 工控网导出使用实际编程人匹配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java
index a235061..1db2720 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java
@@ -4,20 +4,17 @@
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,9 +25,7 @@
private final NcNodeService nodeService;
private final RuntimeService runtimeService;
private final IdentityService identityService;
- private final MachineService machineService;
private final ProduceDivisionService produceDivisionService;
- private final NodeDeptQueryService nodeDeptQueryService;
private final FlowCommonService flowCommonService;
private final FlowProgramFileService flowProgramFileService;
/**
@@ -39,6 +34,9 @@
@Transactional
public void startUnlock(Long nodeId){
NcNode programPackage = nodeService.getById(nodeId);
+ if(flowCommonService.isProcessInstanceActive(programPackage.getProcessInstanceId())){
+ throw new ServiceException("娴佺▼姝ｅ湪杩涜");
+ }
Map<String, Object> vars = new HashMap<>();
flowCommonService.putFlowVariablesByNode(vars,programPackage);
--
Gitblit v1.9.3