From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 06 六月 2025 15:47:00 +0800 Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置 --- lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java index bb5278e..a79def8 100644 --- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java +++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java @@ -3,6 +3,7 @@ import org.flowable.task.api.Task; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto; +import org.jeecg.modules.flowable.domain.dto.FlowNextDto; import org.jeecg.modules.flowable.domain.dto.FlowViewerDto; import org.jeecg.modules.flowable.domain.vo.FlowTaskVo; @@ -180,9 +181,13 @@ * @param flowTaskVo 浠诲姟 * @return */ - Result getNextFlowNode(FlowTaskVo flowTaskVo); + Result<List<FlowNextDto>> getNextFlowNode(FlowTaskVo flowTaskVo); - - + /** + * 妫�鏌� 骞惰浠诲姟鑺傜偣鏄惁閮藉凡瀹屾垚 + * @param currentTaskId + * @return + */ + boolean checkParallelCompletion(String currentTaskId); } -- Gitblit v1.9.3