From 9858d97e0814bf61b97c937ef209222403fa1f27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 04 七月 2025 02:43:31 +0800
Subject: [PATCH] dnc导出修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index c166cec..15b4550 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -48,12 +48,12 @@
*/
public void start(long programId){
Map<String, Object> vars = new HashMap<>();
- //NcProgram prog = ncProgramService.getById(programId);
+ NcProgram prog = ncProgramService.getById(programId);
NcNode progNode = ncNodeService.getById(programId);
Machine machine = machineService.getByCode(progNode.getMachineCode());
vars.put("machineCode",machine.getCode());
vars.put("machineMode",machine.getName());
- vars.put("processEdition",progNode.getProcessEdition());
+ vars.put("processEdition",prog.getProcessEdition());
vars.put("programId",programId);
vars.put("program",progNode);
@@ -67,20 +67,4 @@
//log.info()
}
- /**
- * 鐢熸垚闆剁粍浠剁紪鍙�
- * 鍥惧彿銆佸浘鍙风増娆°�佸伐搴忓彿銆佸伐搴忓悕绉般�佸伐鑹虹増娆°�佸伐搴忕増娆� 缁勫悎璧锋潵鑾峰緱闆剁粍浠跺彿
- * @param startVO
- * @return
- */
- String generatePartNo(TaskAssignVO startVO){
- //TODO 杩欎釜鏍煎紡鏈‘瀹氾紝闇�瑕佺‘璁�
- return String.format("%s-%s-%s-%s-%s-%s",
- startVO.getDrawingNo(),
- startVO.getDrawingNoEdition(),
- startVO.getProcessNo(),
- startVO.getProcessName(),
- startVO.getCraftEdition(),
- startVO.getProcessEdition());
- }
}
--
Gitblit v1.9.3