From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 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 a3b8bf8..a5d0bc7 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
@@ -7,17 +7,20 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
+import org.springblade.mdm.program.service.ProgramSeqService;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
import org.springframework.transaction.annotation.Transactional;
@@ -29,28 +32,41 @@
@Service("startDispatcher")
public class StartDispatcher {
private final RuntimeService runtimeService;
-
+ private final ProgramSeqService programSeqService;
private final IdentityService identityService;
private final NcNodeService ncNodeService;
private final FlowProgramFileService flowProgramFileService;
private final NodeDeptQueryService nodeDeptQueryService;
private final FlowCommonService flowCommonService;
-
+ private final ProduceDivisionService produceDivisionService;
+ private final UserCommonService userCommonService;
/**
* 鍚姩娲惧伐娴佺▼
* @param startVO 琛ㄥ崟鏁版嵁
* @return 娴佺▼瀹炰緥id
*/
@Transactional
- public String start(TaskAssignVO startVO){
+ public FlowStartResult start(TaskAssignVO startVO){
if(!FlowContants.Y.equals(startVO.getIsTempFlow())){
startVO.setIsTempFlow(FlowContants.N);
}
Map<String, Object> vars = new HashMap<>();
- ProduceDivision div = flowCommonService.putDefaultAssignees(vars,startVO.getDrawingNo(),null);
+ ProduceDivision div;
+ if(startVO.getProducePlanId() != null && startVO.getProducePlanId()!=0){
+ //鐣岄潰涓婇�夋嫨浜嗗垎宸ヨ〃鐨勬儏鍐碉紝鐩存帴鏍规嵁id鑾峰彇
+ div = produceDivisionService.getById(startVO.getProducePlanId());
+ vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowContants.CHECKER,div.getCheckerId());
+ vars.put(FlowContants.SENIOR,div.getSeniorId());
+ vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
+
+ }else {
+ div = flowCommonService.putDefaultAssignees(vars, startVO.getDrawingNo(), null);
+ }
vars.put(FlowContants.TITLE,startVO.getTitle());
//鏈哄簥缂栧彿
@@ -73,14 +89,14 @@
if(StringUtils.isNotBlank(startVO.getDeviation())) {
vars.put(FlowContants.DEVIATION, startVO.getDeviation());//鍋忕鍗�
}
- String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
+ String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo(),startVO.getProcessEdition());
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPkgName);
vars.put(FlowContants.IS_TEMP_FLOW,FlowContants.Y.equals(startVO.getIsTempFlow())?FlowContants.Y:FlowContants.N);
NcNode curedProgramPackage = null;
if(!startVO.isTemporaryFlow() && !startVO.isDeviationFlow()) {
//姝ｅ父娴佺▼(闈炰复鏃舵祦绋�) 涓斾笉鏄� 鍋忕鍗�,鎵嶅尮閰嶅浐鍖栫▼搴�
- curedProgramPackage = ncNodeService.getLastCuredProgramPackageWithoutProcessEdition(programPkgName,startVO.getMachineCode());
+ curedProgramPackage = ncNodeService.getLastCuredProgramWithoutProcessEdition(startVO.getDrawingNo(),startVO.getProcessNo(),startVO.getMachineCode());
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
vars.put(FlowContants.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowContants.Y : FlowContants.N);
//宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
@@ -110,7 +126,7 @@
vars.put(FlowContants.MY_PROCESS_NAME, myProcessName);
- String businessKey = "0";//涓氬姟琛╧ey
+ String businessKey = Func.toStr(startVO.getTaskDispatchId());//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance inst;
if(startVO.isTemporaryFlow()){
@@ -120,13 +136,20 @@
vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//绗竴涓敤鎴风粍闀�
inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
}
+ FlowStartResult result = new FlowStartResult();
+ result.setProcessInstanceId(inst.getProcessInstanceId());
+ //鐢熸垚绋嬪簭缂栧彿
+ String programNo = programSeqService.generageProgramNo();
+ runtimeService.setVariable(inst.getProcessInstanceId(),FlowContants.PROGRAM_NO,programNo);
+ result.setProgramNo(programNo);
+
if(curedProgramPackage != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲��
copyFlowProgramFiles(curedProgramPackage.getId(),inst.getProcessInstanceId());
curedProgramPackage.setProcessInstanceId(inst.getProcessInstanceId());
ncNodeService.updateById(curedProgramPackage);
}
- return inst.getProcessInstanceId();
+ return result;
}
--
Gitblit v1.9.3