From a3a9933cf1b49006edf470615236f94ebdaa4cb9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 九月 2025 17:04:24 +0800
Subject: [PATCH] 增加车床程序处理；退回改为实际编程员
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 156 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 126 insertions(+), 30 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 a035595..5f7dad7 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,60 +1,156 @@
package org.springblade.mdm.flow.excution;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.flowable.common.engine.impl.identity.Authentication;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
-import org.springblade.flow.core.feign.IFlowClient;
-import org.springblade.flow.core.pojo.entity.BladeFlow;
-import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+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.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.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;
+@AllArgsConstructor
@Service("startDispatcher")
public class StartDispatcher {
+ private final RuntimeService runtimeService;
- @Autowired
- private RuntimeService runtimeService;
- @Autowired
- private AutoAssignUsersService autoAssignUsersService;
- @Autowired
- private IdentityService identityService;
- private static final String PROCESS_KEY = "dispatch";
+ private final IdentityService identityService;
+ private final NcNodeService ncNodeService;
- public void start(TaskAssignVO startVO){
+ private final FlowProgramFileService flowProgramFileService;
+ private final NodeDeptQueryService nodeDeptQueryService;
+ private final FlowCommonService flowCommonService;
- Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
- Map<String, Object> vars = new HashMap<>(preAssignee);
+ /**
+ * 鍚姩娲惧伐娴佺▼
+ * @param startVO 琛ㄥ崟鏁版嵁
+ * @return 娴佺▼瀹炰緥id
+ */
+ @Transactional
+ public String start(TaskAssignVO startVO){
+ if(!FlowContants.Y.equals(startVO.getIsTempFlow())){
+ startVO.setIsTempFlow(FlowContants.N);
+ }
+ Map<String, Object> vars = new HashMap<>();
- vars.put("machineCode",startVO.getMachineCode());
- vars.put("machineMode",startVO.getMachineMode());
+ ProduceDivision div = flowCommonService.putDefaultAssignees(vars,startVO.getDrawingNo(),null);
- vars.put("processNo",startVO.getProcessNo());
- vars.put("processName",startVO.getProcessName());
- vars.put("processEdition",startVO.getProcessEdition());
+ vars.put(FlowContants.TITLE,startVO.getTitle());
- vars.put("craftEdition",startVO.getCraftEdition());
+ //鏈哄簥缂栧彿
+ vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());
+ String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
+ vars.put(FlowContants.WORKSHOP,workshop);
+ //鏈哄簥鍨嬪彿
+ vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());
+
+ vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());
+ vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());
+ vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());
+ vars.put(FlowContants.CRAFT_EDITION,startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
- vars.put("drawingNo",startVO.getDrawingNo());
- vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
+ vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());
+ vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
+ vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());
- //vars.put("producePlanId",startVO.getCraftEdition());
+ if(StringUtils.isNotBlank(startVO.getDeviation())) {
+ vars.put(FlowContants.DEVIATION, startVO.getDeviation());//鍋忕鍗�
+ }
+ String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
+ 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());
+ //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+ 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.HAS_CURED_PROGRAM,FlowContants.N);
+ }
+ String myProcessName = "璇曞垏涓嬪彂娴佺▼";
+ 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 = "鍥哄寲涓嬪彂娴佺▼";
+ }
+
+ vars.put(FlowContants.MY_PROCESS_NAME, myProcessName);
String businessKey = "0";//涓氬姟琛╧ey
-
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(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);
+ }
+ if(curedProgramPackage != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲��
+ copyFlowProgramFiles(curedProgramPackage.getId(),inst.getProcessInstanceId());
+ curedProgramPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(curedProgramPackage);
+ }
- int a=1;
- a =2;
- //log.info()
+
+ return inst.getProcessInstanceId();
}
+
+
+ /**
+ * 澶嶅埗娴佺▼绋嬪簭鏂囦欢
+ * @param processInstanceId 鏂板惎鍔ㄧ殑娴佺▼id
+ */
+ private void copyFlowProgramFiles(long packageNameNodeId,String processInstanceId) {
+ List<Long> fileIds = ncNodeService.getProgramFilesByPackageId(packageNameNodeId).stream().map(NcNode::getFlowProgramFileId).toList();
+ if(!fileIds.isEmpty()) {
+ List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().in(FlowProgramFile::getId, fileIds).list();
+
+ for (FlowProgramFile file : fileList) {
+ FlowProgramFile newFile = new FlowProgramFile();
+ BeanUtils.copyProperties(file, newFile);
+ EntityUtil.clearBaseProperties(newFile);
+
+ newFile.setProcessInstanceId(processInstanceId);
+
+ this.flowProgramFileService.save(newFile);
+ }
+ }
+ }
+
+
}
--
Gitblit v1.9.3