From f379dade90ec59e08c037cba4917308e3dfdb928 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 17:02:06 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 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 20600ed..0570445 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,6 +1,7 @@
package org.springblade.mdm.flow.excution;
import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
@@ -10,26 +11,37 @@
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.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.service.ProcessProgRefService;
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;
+@AllArgsConstructor
@Service("startDispatcher")
public class StartDispatcher {
- @Autowired
- private RuntimeService runtimeService;
- @Autowired
- private AutoAssignUsersService autoAssignUsersService;
- @Autowired
- private IdentityService identityService;
+ private final RuntimeService runtimeService;
+ private final AutoAssignUsersService autoAssignUsersService;
+
+ private final IdentityService identityService;
+ private final ProcessProgRefService processProgRefService;
+ private final NcProgramService ncProgramService;
+
private static final String PROCESS_KEY = "dispatch";
+ /**
+ * 鍚姩娲惧伐娴佺▼
+ * @param startVO
+ */
public void start(TaskAssignVO startVO){
- Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
+ Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
Map<String, Object> vars = new HashMap<>(preAssignee);
vars.put("machineCode",startVO.getMachineCode());
@@ -44,8 +56,12 @@
vars.put("drawingNo",startVO.getDrawingNo());
vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
+ vars.put("productModel",startVO.getProductModel());
- //vars.put("producePlanId",startVO.getCraftEdition());
+
+ List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
+ //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+ vars.put("hasCuredProgram",!curedNcPrograms.isEmpty() ? "Y":"N");
String businessKey = "0";//涓氬姟琛╧ey
@@ -53,7 +69,15 @@
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
- int a=1;
+ //濡傛灉鏈夊凡鍥哄寲绋嬪簭锛屽垯灏嗙▼搴廼d鎻掑叆娴佺晠鍏宠仈琛�
+ for(NcProgram ncProgram : curedNcPrograms){
+ ProcessProgRef ref = new ProcessProgRef();
+ ref.setProcessInstanceId(pinst.getId());
+ ref.setNcProgramId(ncProgram.getId());
+
+ processProgRefService.save(ref);
+ }
+
//log.info()
}
@@ -63,15 +87,15 @@
* @param startVO
* @return
*/
+ /*
String generatePartNo(TaskAssignVO startVO){
//TODO 杩欎釜鏍煎紡鏈‘瀹氾紝闇�瑕佺‘璁�
return String.format("%s-%s-%s-%s-%s-%s",
- startVO.getDrawingNo(),
- startVO.getDrawingNoEdition(),
+ startVO.getPartNo(),
+ startVO.getPartNoEdition(),
startVO.getProcessNo(),
startVO.getProcessName(),
startVO.getCraftEdition(),
startVO.getProcessEdition());
-
- }
+ }*/
}
--
Gitblit v1.9.3