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 | 61 ++++++++++--------------------
1 files changed, 20 insertions(+), 41 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 6b01c31..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
@@ -4,9 +4,13 @@
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,40 +33,31 @@
@Autowired
private NcProgramService ncProgramService;
+ @Autowired
+ private NcNodeService ncNodeService;
+ @Autowired
+ private MachineService machineService;
/**
* 鍥哄寲娴佺▼鐨刱ey
*/
private static final String PROCESS_KEY = "program-cure";
+ /**
+ * 鍚姩鍥哄寲娴佺▼
+ * @param programId 绋嬪簭id
+ */
public void start(long programId){
Map<String, Object> vars = new HashMap<>();
- /*
- Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
- Map<String, Object> vars = new HashMap<>(preAssignee);
+ 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",prog.getProcessEdition());
+ vars.put("programId",programId);
+ vars.put("program",progNode);
- 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());
-
- //闆剁粍浠朵唬鐮�
- String partNo = generatePartNo(startVO);
- vars.put("partNo",partNo);
-
- NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
- vars.put("curedNcProgram",curedNcProgram);
-
- //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
- vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
- */
String businessKey = "0";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
@@ -72,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