From a638cb450abb78346ecf19754b639fc945bc486b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 19:21:16 +0800
Subject: [PATCH] zip包判断修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
index 63ee94c..204c196 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
@@ -18,6 +18,7 @@
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
@@ -39,13 +40,14 @@
private final IdentityService identityService;
private final FlowProgramFileService flowProgramFileService;
private final ReplaceProgramFileService replaceProgramFileService;
- private final MachineService machineService;
+ private final NodeDeptQueryService nodeDeptQueryService;
public static final String NODE_ID = "nodeId";
/**
* 杞淳锛屽苟璁板綍鑷繁鐨勫娉ㄤ俊鎭�
* @param nodeId 鏇挎崲鐨勮妭鐐筰d
*/
+ /*
@Transactional
public void prestart(long nodeId,String tempInstanceId) {
List<NcNode> fileNodes = nodeService.lambdaQuery()
@@ -67,6 +69,8 @@
flowProgramFileService.save(newFile);
}
}
+
+ */
@Transactional
public NcNodeVO pre(long nodeId, String tempInstanceId) {
@@ -97,6 +101,8 @@
BeanUtils.copyProperties(node, vo);
vo.setProcessInstanceId(tempInstanceId);
+ vo.setWorkshop(nodeDeptQueryService.getWorkshopNameByMachineCode(node.getMachineCode()));
+
return vo;
}
--
Gitblit v1.9.3