From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 139 ++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 73 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 78da526..72d5b7e 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
@@ -1,123 +1,116 @@
package org.springblade.mdm.flow.service;
import lombok.AllArgsConstructor;
-import org.flowable.engine.HistoryService;
+import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.history.HistoricTaskInstance;
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.basesetting.machine.service.MachineService;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springblade.mdm.program.vo.DncSendBackData;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* 鍥哄寲娴佺▼鏈嶅姟
*/
+@Slf4j
@Service
@AllArgsConstructor
public class CureFlowService {
private final RuntimeService runtimeService;
- private final HistoryService historyService;
-
private final IdentityService identityService;
+ private final NodeDeptQueryService nodeDeptQueryService;
+ private final NcNodeService ncNodeService;
- private final NcProgramService ncProgramService;
-
+ private final FlowProgramFileService flowProgramFileService;
+ private final ProduceDivisionService produceDivisionService;
private final MachineService machineService;
+ private final FlowCommonService flowCommonService;
- private final ProcessProgRefService processProgRefService;
/**
- * 鍥哄寲娴佺▼鐨刱ey
+ * 鍚姩鍥哄寲娴佺▼
*/
- private static final String PROCESS_KEY = "program-cure";
-
-
-
@Transactional
- public void startCure(List<NcProgram> programs) {
- //DncSendBackData sendBackData;
- //List<Long> ncProgramIdList = dataList.stream().map(DncSendBackData::getId).toList();
- //Map<String,List<NcProgram>> groupedProgram = groupProgramsByMachineCode(ncProgramIdList);
- //List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
- //鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
- programs.forEach(this::startOne);
+ public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
+ pkgIdFileMap.forEach(this::startOneNew);
}
/**
- * 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
- * @param prog 鏁版帶绋嬪簭瀹炰綋
+ * 鍚姩涓�璋冪▼搴忕殑鍥哄寲娴佺▼
+ * @param nodeId
+ * @param fileList
*/
- public void startOne(NcProgram prog){
+ private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
Map<String, Object> vars = new HashMap<>();
+ NcNode programPackage = this.ncNodeService.getById(nodeId);
+ vars.put(FlowConstant.NODE_ID,programPackage.getId());
- //NcProgram prog = programs.get(0);
- Machine machine = machineService.getByCode(prog.getMachineCode());
- vars.put("machineCode",prog.getMachineCode());
- vars.put("machineMode",machine.getName());
- vars.put("processEdition",prog.getProcessEdition());
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
+ /*
+ vars.put(FlowVariableContants.MACHINE_CODE,programPackage.getMachineCode());
- //璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
- ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
- //鑾峰彇瀹℃壒鐢ㄦ埛
- List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(preRef.getProcessInstanceId())
- .orderByHistoricTaskInstanceEndTime().desc()
- .list();
-
- String programmer = null;
- String checker = null;
- String senior = null;
-
- for (HistoricTaskInstance task : historicTasks) {
- // 鑾峰彇浠诲姟鐨勫姙鐞嗕汉
- if(task.getTaskDefinitionKey().equals("programmingTask")){
- //缂栧埗
- programmer = task.getAssignee();
- }else if(task.getTaskDefinitionKey().equals("check")){
- //鏍″
- checker = task.getAssignee();
- }else if(task.getTaskDefinitionKey().equals("senior")){
- //瀹℃牳
- senior = task.getAssignee();
- }
-
+ //鏈哄簥鍨嬪彿
+ Machine machine = machineService.getByCode(programPackage.getMachineCode());
+ if(machine != null) {
+ vars.put(FlowVariableContants.MACHINE_MODE,machine.getName());
}
- vars.put("programmer",programmer);
- vars.put("checker",checker);
- vars.put("senior",senior);
- String businessKey = "0";//涓氬姟琛╧ey
+ String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
+ vars.put(FlowVariableContants.WORKSHOP,workshop);
+
+ vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
+ vars.put(FlowVariableContants.PROCESS_NO,programPackage.getProcessNo());
+ vars.put(FlowVariableContants.PROCESS_NAME,programPackage.getProcessName());
+ vars.put(FlowVariableContants.PROCESS_EDITION,programPackage.getProcessEdition());
+ vars.put(FlowVariableContants.CRAFT_EDITION, programPackage.getCraftEdition());
+ vars.put(FlowVariableContants.DRAWING_NO,programPackage.getDrawingNo());
+ vars.put(FlowVariableContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
+
+ vars.put(FlowVariableContants.PRODUCT_MODEL,programPackage.getProductModel());
+ vars.put(FlowVariableContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
+ */
+
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ vars.put(FlowVariableConstant.ASSIGNEE,vars.get(FlowVariableConstant.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
- ProcessProgRef ref = new ProcessProgRef();
- ref.setProcessInstanceId(pinst.getId());
- ref.setNcProgramId(prog.getId());
+ vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- processProgRefService.save(ref);
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, "涓存椂鏇存敼鍗曞洖浼�");
+ vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-涓存椂鏇存敼鍗曞洖浼�");//鑷姩澧炲姞鏍囬
+ }else {
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ }
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowConstant.CURE_PROCESS_KEY,"0",vars);
+
+ //鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
+ programPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(programPackage);
+
+ for(FlowProgramFile flowProgramFile : fileList){
+ flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
+ }
+ this.flowProgramFileService.saveBatch(fileList);
+
+ log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
-
/**
* 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
* @param ncProgramIdList
--
Gitblit v1.9.3