From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index e8160cb..1ea08eb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -1,6 +1,5 @@
package org.springblade.mdm.flow.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -9,12 +8,10 @@
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
@@ -22,6 +19,7 @@
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,9 +36,7 @@
private final StartDispatcher dispatcher;
- private final TaskService taskService;
private final RuntimeService runtimeService;
- private final FlowProgramFileService flowProgramFileService;
private final TryFlowCompleteService tryFlowCompleteService;
@@ -49,6 +45,7 @@
private final BatchDispatchService dispatchService;
private final ReplaceFlowCompleteService replaceFlowCompleteService;
private final TempFlowCompleteService tempFlowCompleteService;
+ private final CureFlowCompleteService cureFlowCompleteService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -64,27 +61,52 @@
}
try {
- String instId = dispatcher.start(startVO);
+ FlowStartResult result = dispatcher.start(startVO);
dispatch.setStatus(TaskDispatch.STATUS_STARTED);
- dispatch.setProcessInstanceId(instId);
+ dispatch.setProcessInstanceId(result.getProcessInstanceId());
+ dispatch.setProgramNo(result.getProgramNo());
taskDispatchService.updateById(dispatch);
return R.data(true);
} catch (Exception e) {
dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
dispatch.setErrMsg(e.getMessage());
taskDispatchService.updateById(dispatch);
- return R.fail("浠诲姟鍚姩寮傚父:"+e.getMessage());
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
}
}catch(Exception e){
- return R.fail(e.getMessage());
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
}
}
-
+ /**
+ * 鑾峰彇瀹為檯瀹℃壒娴佺▼鎵ц鏈嶅姟
+ * @param processInstanceId
+ * @return
+ */
AbstractFlowCompleteService getActualService(String processInstanceId){
ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
- if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)
+ if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)
|| inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowContants.IS_TEMP_FLOW));
if(FlowContants.N.equals(isTempFlow)){
@@ -92,6 +114,8 @@
}else{
return tempFlowCompleteService;
}
+ }else if(inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
+ return cureFlowCompleteService;
}else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
return replaceFlowCompleteService;
}else{
--
Gitblit v1.9.3