From 96481362fed4eab7b96cc9016ece1917b43bbcc5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 14:54:38 +0800
Subject: [PATCH] dnc导出，增加写入下发目录的代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 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 49b4588..7e55e70 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
@@ -10,6 +10,7 @@
import org.springblade.flow.core.feign.IFlowClient;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
@@ -33,7 +34,7 @@
private final ProcessProgRefService processProgRefService;
private final NcProgramService ncProgramService;
- private static final String PROCESS_KEY = "dispatch";
+ public static final String PROCESS_KEY = "dispatch";
/**
* 鍚姩娲惧伐娴佺▼
@@ -41,25 +42,33 @@
*/
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(FlowContants.MACHINE_CODE,startVO.getMachineCode());
- vars.put("processNo",startVO.getProcessNo());
- vars.put("processName",startVO.getProcessName());
- vars.put("processEdition",startVO.getProcessEdition());
+ //鏈哄簥鍨嬪彿
+ vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());
- vars.put("craftEdition",startVO.getCraftEdition());
+ vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());
+
+ vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());
+
+ vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());
+
+ vars.put(FlowContants.CRAFT_EDITION,startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
- vars.put("partNo",startVO.getPartNo());
- vars.put("partNoEdition",startVO.getPartNoEdition());
+
+
+ vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());
+
+ vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
- vars.put("productModel",startVO.getProductModel());
+ vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());
- List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getPartNo(),startVO.getMachineCode());
+ List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
vars.put("hasCuredProgram",!curedNcPrograms.isEmpty() ? "Y":"N");
@@ -74,7 +83,7 @@
ProcessProgRef ref = new ProcessProgRef();
ref.setProcessInstanceId(pinst.getId());
ref.setNcProgramId(ncProgram.getId());
-
+ ref.setProcessDefinitionKey(pinst.getProcessDefinitionKey());
processProgRefService.save(ref);
}
--
Gitblit v1.9.3