From 813f0f6d391b7f24682204c22c059ef69b124fa6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 23:59:15 +0800
Subject: [PATCH] 增加流程与程序关联查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 9375533..213f2e6 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
@@ -1,5 +1,6 @@
package org.springblade.mdm.flow.excution;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
@@ -9,10 +10,13 @@
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service("startDispatcher")
@@ -24,6 +28,9 @@
private AutoAssignUsersService autoAssignUsersService;
@Autowired
private IdentityService identityService;
+
+ @Autowired
+ private NcProgramService ncProgramService;
private static final String PROCESS_KEY = "dispatch";
public void start(TaskAssignVO startVO){
@@ -40,9 +47,19 @@
vars.put("craftEdition",startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
+ vars.put("partNo",startVO.getPartNo());
+ vars.put("partNoEdition",startVO.getPartNoEdition());
+ vars.put("planLockDays",startVO.getPlanLockDays());
- //vars.put("producePlanId",startVO.getCraftEdition());
+ //闆剁粍浠朵唬鐮�
+ String partNo = generatePartNo(startVO);
+ vars.put("partNo",partNo);
+ List<NcProgram> curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
+ //vars.put("curedNcProgram",curedNcProgram);
+
+ //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+ vars.put("hasCuredProgram",!curedNcProgram.isEmpty() ? "Y":"N");
String businessKey = "0";//涓氬姟琛╧ey
@@ -50,7 +67,23 @@
ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
int a=1;
- a =2;
//log.info()
}
+
+ /**
+ * 鐢熸垚闆剁粍浠剁紪鍙�
+ * 鍥惧彿銆佸浘鍙风増娆°�佸伐搴忓彿銆佸伐搴忓悕绉般�佸伐鑹虹増娆°�佸伐搴忕増娆� 缁勫悎璧锋潵鑾峰緱闆剁粍浠跺彿
+ * @param startVO
+ * @return
+ */
+ String generatePartNo(TaskAssignVO startVO){
+ //TODO 杩欎釜鏍煎紡鏈‘瀹氾紝闇�瑕佺‘璁�
+ return String.format("%s-%s-%s-%s-%s-%s",
+ startVO.getPartNo(),
+ startVO.getPartNoEdition(),
+ startVO.getProcessNo(),
+ startVO.getProcessName(),
+ startVO.getCraftEdition(),
+ startVO.getProcessEdition());
+ }
}
--
Gitblit v1.9.3