From d34d3c83500d5a68715a280eee3d930c88291d71 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 19:10:05 +0800
Subject: [PATCH] 增加新编程序统计；固化程序统计
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 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 04274a5..ba90311 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
@@ -2,15 +2,13 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
@@ -34,8 +32,6 @@
private final RuntimeService runtimeService;
- private final HistoryService historyService;
- private final TaskService taskService;
private final IdentityService identityService;
private final NodeDeptQueryService nodeDeptQueryService;
private final NcNodeService ncNodeService;
@@ -43,7 +39,7 @@
private final FlowProgramFileService flowProgramFileService;
private final ProduceDivisionService produceDivisionService;
private final MachineService machineService;
-
+ private final FlowCommonService flowCommonService;
/**
* 鍚姩鍥哄寲娴佺▼
@@ -61,10 +57,9 @@
private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
Map<String, Object> vars = new HashMap<>();
NcNode programPackage = this.ncNodeService.getById(nodeId);
-
+ vars.put(FlowContants.NODE_ID,programPackage.getId());
vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
- //鏈哄簥鍨嬪彿
- //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
+
//鏈哄簥鍨嬪彿
Machine machine = machineService.getByCode(programPackage.getMachineCode());
if(machine != null) {
@@ -74,6 +69,7 @@
String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
vars.put(FlowContants.WORKSHOP,workshop);
+ vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
@@ -85,22 +81,23 @@
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
- ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
- vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
- vars.put(FlowContants.CHECKER,div.getCheckerId());
- vars.put(FlowContants.SENIOR,div.getSeniorId());
- vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
-
- vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
+ vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
+ vars.put(FlowContants.TITLE,programPackage.getName()+"-鍋忕鍥炰紶");//鑷姩澧炲姞鏍囬
+ }else {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowContants.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ }
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
--
Gitblit v1.9.3