From d0e196b4c6f302b9d571d6220471d15e2b97c527 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 04 七月 2025 01:36:51 +0800
Subject: [PATCH] dnc导出修改&node字段调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..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
@@ -10,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")
@@ -25,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){
@@ -41,12 +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());
- //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
@@ -66,12 +79,11 @@
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