From de19116f884445318620e8436c5b1fbf829c00b5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 19:44:37 +0800
Subject: [PATCH] dnc导出

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java |   83 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 14 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 8a7313a..342c377 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,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;
@@ -9,38 +11,91 @@
 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 IFlowClient flowClient;
-	@Autowired
-	private RuntimeService runtimeService;
-	@Autowired
-	private AutoAssignUsersService autoAssignUsersService;
-	@Autowired
-	private IdentityService identityService;
-	private static final String PROCESS_KEY = "dispatch";
 
+	private final RuntimeService runtimeService;
+	private final AutoAssignUsersService autoAssignUsersService;
+
+	private final IdentityService identityService;
+	private final ProcessProgRefService processProgRefService;
+	private final NcProgramService ncProgramService;
+
+	public 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());
+		vars.put("machineMode",startVO.getMachineMode());
+
+		vars.put("processNo",startVO.getProcessNo());
+		vars.put("processName",startVO.getProcessName());
+		vars.put("processEdition",startVO.getProcessEdition());
+
+		vars.put("craftEdition",startVO.getCraftEdition());
+		vars.put("planStartTime",startVO.getPlanStartTime());
+		vars.put("drawingNo",startVO.getDrawingNo());
+		vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
+		vars.put("planLockDays",startVO.getPlanLockDays());
+		vars.put("productModel",startVO.getProductModel());
+
+
+		List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
+		//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+		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);
-		//R<BladeFlow> flowR = flowClient.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
-		//R<BladeFlow> flowR = flowClient.startProcessInstanceById(PROCESS_KEY,businessKey,vars);
 
-		int a=1;
-		a =2;
+		//濡傛灉鏈夊凡鍥哄寲绋嬪簭锛屽垯灏嗙▼搴廼d鎻掑叆娴佺晠鍏宠仈琛�
+		for(NcProgram ncProgram : curedNcPrograms){
+			ProcessProgRef ref = new ProcessProgRef();
+			ref.setProcessInstanceId(pinst.getId());
+			ref.setNcProgramId(ncProgram.getId());
+			ref.setProcessDefinitionKey(pinst.getProcessDefinitionKey());
+			processProgRefService.save(ref);
+		}
+
 		//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