From bc4056543fdbef38ac8bf1648df934d5bc8e5bde Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 八月 2025 01:31:11 +0800
Subject: [PATCH] 调试固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 101 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index 342c377..387a907 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -2,6 +2,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
@@ -10,11 +11,18 @@
import org.springblade.flow.core.feign.IFlowClient;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springblade.mdm.utils.EntityUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
@@ -30,10 +38,13 @@
private final AutoAssignUsersService autoAssignUsersService;
private final IdentityService identityService;
- private final ProcessProgRefService processProgRefService;
- private final NcProgramService ncProgramService;
+ private final NcNodeService ncNodeService;
+ //private final ProcessProgRefService processProgRefService;
+ //private final NcProgramService ncProgramService;
- public static final String PROCESS_KEY = "dispatch";
+ private final FlowProgramFileService flowProgramFileService;
+
+ //public static final String PROCESS_KEY = "dispatch";
/**
* 鍚姩娲惧伐娴佺▼
@@ -43,42 +54,74 @@
Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
Map<String, Object> vars = new HashMap<>(preAssignee);
+ vars.put(FlowContants.ASSIGNEE,preAssignee.get(FlowContants.TEAM_LEADER));//绗竴涓鎵圭敤鎴凤細缁勯暱
- vars.put("machineCode",startVO.getMachineCode());
- vars.put("machineMode",startVO.getMachineMode());
+ vars.put(FlowContants.TITLE,startVO.getTitle());
+ //鏈哄簥缂栧彿
+ vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());
- vars.put("processNo",startVO.getProcessNo());
- vars.put("processName",startVO.getProcessName());
- vars.put("processEdition",startVO.getProcessEdition());
+ //鏈哄簥鍨嬪彿
+ vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());
- vars.put("craftEdition",startVO.getCraftEdition());
+ vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());
+
+ vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());
+
+ vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());
+
+ vars.put(FlowContants.CRAFT_EDITION,startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
- vars.put("drawingNo",startVO.getDrawingNo());
- vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
+
+
+ vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());
+
+ vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
- vars.put("productModel",startVO.getProductModel());
+ vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());
- List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
+ //List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
+ String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
+
+ NcNode programPkg = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
- vars.put("hasCuredProgram",!curedNcPrograms.isEmpty() ? "Y":"N");
-
-
- String businessKey = "0";//涓氬姟琛╧ey
-
- identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
-
- //濡傛灉鏈夊凡鍥哄寲绋嬪簭锛屽垯灏嗙▼搴廼d鎻掑叆娴佺晠鍏宠仈琛�
- for(NcProgram ncProgram : curedNcPrograms){
- ProcessProgRef ref = new ProcessProgRef();
- ref.setProcessInstanceId(pinst.getId());
- ref.setNcProgramId(ncProgram.getId());
- ref.setProcessDefinitionKey(pinst.getProcessDefinitionKey());
- processProgRefService.save(ref);
+ vars.put(FlowContants.HAS_CURED_PROGRAM,programPkg != null ? FlowContants.Y:FlowContants.N);
+ //宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
+ if(programPkg != null){
+ vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(programPkg.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
+ vars.put(FlowContants.VALIDITY_PERIOD, programPkg.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
+ }else{
+ vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
+ vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
}
- //log.info()
+ String businessKey = "0";//涓氬姟琛╧ey
+ identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
+
+ if(programPkg != null) {
+ copyFlowProgramFiles(programPkg,inst.getProcessInstanceId());
+ }
+
+ }
+
+ /**
+ * 澶嶅埗娴佺▼绋嬪簭鏂囦欢
+ * @param programPkg 鍘熷鐨勫浐鍖栫▼搴忓寘鍚嶈妭鐐�
+ */
+ private void copyFlowProgramFiles(NcNode programPkg,String processInstanceId) {
+ List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery()
+ .eq(FlowProgramFile::getProcessInstanceId,programPkg.getProcessInstanceId()).list();
+
+ for (FlowProgramFile file : fileList) {
+ FlowProgramFile newFile = new FlowProgramFile();
+ BeanUtils.copyProperties(file, newFile);
+ EntityUtil.clearBaseProperties(newFile);
+
+ newFile.setProcessInstanceId(processInstanceId);
+
+ this.flowProgramFileService.save(newFile);
+ }
}
/**
--
Gitblit v1.9.3