From 532611ebe6ccecd6d17930c33a24ddfd5b1c2610 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 14:34:26 +0800
Subject: [PATCH] 增加程序文件列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 bc6ce9d..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
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service("startDispatcher")
@@ -46,19 +47,19 @@
vars.put("craftEdition",startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
- vars.put("drawingNo",startVO.getDrawingNo());
- vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
+ vars.put("partNo",startVO.getPartNo());
+ vars.put("partNoEdition",startVO.getPartNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
//闆剁粍浠朵唬鐮�
String partNo = generatePartNo(startVO);
vars.put("partNo",partNo);
- NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
- vars.put("curedNcProgram",curedNcProgram);
+ List<NcProgram> curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
+ //vars.put("curedNcProgram",curedNcProgram);
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
- vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
+ vars.put("hasCuredProgram",!curedNcProgram.isEmpty() ? "Y":"N");
String businessKey = "0";//涓氬姟琛╧ey
@@ -78,8 +79,8 @@
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(),
--
Gitblit v1.9.3