From 51054f0da5dd4718212064510fff045815388b90 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 16:31:03 +0800
Subject: [PATCH] 增加临时流程处理
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
index 5b475ee..d3123a6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
@@ -109,6 +109,7 @@
*/
@Transactional
public void start(ReplaceFlowStartVO startVO){
+ flowProgramFileService.checkProgramFiles(startVO.getTempInstanceId(),true);
NcNode programPackage = nodeService.getById(startVO.getNodeId());
Map<String, Object> vars = new HashMap<>();
@@ -117,29 +118,7 @@
flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");
vars.put(FlowContants.TITLE,startVO.getTitle());
- //浠ヤ笅琚玣lowCommonService.putFlowVariablesByNode(vars,programPackage);浠ｆ浛浜�
- /*
- //鏈哄簥缂栧彿
- vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
- Machine machine = machineService.getByCode(programPackage.getMachineCode());
- //鏈哄簥鍨嬪彿
- if(machine != null) {
- vars.put(FlowContants.MACHINE_MODE, machine.getName());
- }
- vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
- vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
- vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
- vars.put(FlowContants.CRAFT_EDITION,programPackage.getCraftEdition());
- vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
- vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
-
- vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
-
- vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
- vars.put(FlowContants.NODE_ID, startVO.getNodeId());
- vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode()));
- */
vars.put("comment", startVO.getComment());
vars.put(FlowContants.MY_PROCESS_NAME,"鏇挎崲娴佺▼");
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
@@ -147,21 +126,31 @@
//鏇存柊鑺傜偣鐨勬祦绋媔d锛岄伩鍏嶉噸澶嶅彂璧锋祦绋�
programPackage.setProcessInstanceId(inst.getId());
this.nodeService.updateById(programPackage);
- /*
- Task startTask = taskService.createTaskQuery()
- .processInstanceId(inst.getId())
- .singleResult();
- // 娣诲姞璇勮
- taskService.addComment(startTask.getId(), inst.getProcessInstanceId(),startVO.getComment());
- */
flowProgramFileService.lambdaUpdate()
.eq(FlowProgramFile::getProcessInstanceId,startVO.getTempInstanceId())
.set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();
}
+ /*
+ public void checkProgramFiles(String processInstanceId,boolean isPass) {
+ List<FlowProgramFile> flowPrograms = this.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list();
+ List<FlowProgramFile> purePrograms = flowPrograms.stream().filter(FlowProgramFile::isProgram).toList();
+ if(isPass && purePrograms.isEmpty()){
+ throw new ServiceException("璇蜂笂浼犵▼搴忔枃浠�");
+ }
+ int totalSeg = 0;
+ if(!purePrograms.isEmpty()){
+ FlowProgramFile progFile = purePrograms.get(0);
+ totalSeg = ProgramFileNameCheckUtil.getProgramSegCount(progFile.getName());
+ }
+ if(totalSeg != purePrograms.size()){
+ throw new ServiceException("搴斾笂浼�"+totalSeg+"娈电▼搴忥紝瀹為檯涓婁紶"+flowPrograms.size()+"娈�");
+ }
+
+ }*/
/**
* 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
--
Gitblit v1.9.3