From 56f5157ae8dba22eb30fb6c7cb132f80b7161932 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 00:53:08 +0800
Subject: [PATCH] 派工界面增加选择主管工艺
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 98 +++++++++++++++++++++++++++++++++---------------
1 files changed, 67 insertions(+), 31 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 4aa863c..5855732 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
@@ -1,6 +1,5 @@
package org.springblade.mdm.flow.excution;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
@@ -9,21 +8,23 @@
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;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,33 +32,44 @@
@AllArgsConstructor
@Service("startDispatcher")
public class StartDispatcher {
-
private final RuntimeService runtimeService;
- private final AutoAssignUsersService autoAssignUsersService;
-
+ private final ProgramSeqService programSeqService;
private final IdentityService identityService;
private final NcNodeService ncNodeService;
private final FlowProgramFileService flowProgramFileService;
private final NodeDeptQueryService nodeDeptQueryService;
- private final ProduceDivisionService produceDivisionService;
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);
- vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//绗竴涓敤鎴风粍闀�
+ 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());
- //涓存椂娴佺▼鏍囧織锛屾槑纭寚瀹歒锛屽睘浜庝复鏃舵祦绋�
- vars.put(FlowContants.IS_TEMP_FLOW,FlowContants.Y.equals(startVO.getIsTempFlow())?FlowContants.Y:FlowContants.N);
//鏈哄簥缂栧彿
vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());
String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
@@ -81,40 +93,64 @@
String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPkgName);
- NcNode curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName,startVO.getMachineCode());
- //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
- vars.put(FlowContants.HAS_CURED_PROGRAM,curedProgramPackage != null ? FlowContants.Y:FlowContants.N);
- //宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
- if(curedProgramPackage != null && Func.isBlank(startVO.getDeviation())){//鍋忕鍗曚紭鍏堬紝濡傛灉鏈夊亸绂诲崟锛岄偅涔堟壘鍒板浐鍖栫▼搴忕殑涔熶笉绠楀浐鍖栦簡
- vars.put(FlowContants.CURED_NODE_ID,curedProgramPackage.getId());
- vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
- vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
+ 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());
+ //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+ vars.put(FlowContants.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowContants.Y : FlowContants.N);
+ //宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
+ if (curedProgramPackage != null) {
+ vars.put(FlowContants.CURED_NODE_ID, curedProgramPackage.getId());
+ vars.put(FlowContants.CURED_LOCKED, curedProgramPackage.hasLocked()?FlowContants.Y:FlowContants.N);
+ vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? FlowContants.Y : FlowContants.N);
+ vars.put("curedProcessEdition", curedProgramPackage.getProcessEdition());
+ vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y : FlowContants.N);
+ } else {
+ vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
+ vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
+ }
+
}else{
- vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
- vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
+ //涓存椂娴佺▼/鍋忕鍗曪紝涓嶅尮閰嶅浐鍖栫▼搴�
+ vars.put(FlowContants.HAS_CURED_PROGRAM,FlowContants.N);
}
String myProcessName = "璇曞垏涓嬪彂娴佺▼";
- if(vars.getOrDefault(FlowContants.HAS_CURED_PROGRAM,FlowContants.N).equals(FlowContants.Y)){
+ if(vars.getOrDefault(FlowContants.IS_TEMP_FLOW,FlowContants.N).equals(FlowContants.Y)){
+ myProcessName = "璇曞垏琛ュ厖娴佺▼";
+ }else if(StringUtils.isNotBlank(startVO.getDeviation()) ){
+ myProcessName = "鍋忕鍗�";
+ }else if(vars.getOrDefault(FlowContants.HAS_CURED_PROGRAM,FlowContants.N).equals(FlowContants.Y)){
myProcessName = "鍥哄寲涓嬪彂娴佺▼";
}
- if(StringUtils.isNotBlank(startVO.getDeviation()) ){
- myProcessName = "鍋忕鍗�";
- }
+
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 = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
+ ProcessInstance inst;
+ if(startVO.isTemporaryFlow()){
+ vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());//绗竴涓敤鎴风紪鍒朵笂浼犳枃浠�
+ inst = runtimeService.startProcessInstanceByKey(FlowContants.APPEND_PROCESS_KEY,businessKey,vars);
+ }else{
+ 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