From 0ef4cc755bddd87799b8bfdd65c8123df6e149d0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 23:52:51 +0800
Subject: [PATCH] 锁定流程完成
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 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 a44762d..5b475ee 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
@@ -14,6 +14,8 @@
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.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;
import org.springblade.mdm.flow.entity.ReplaceProgramFile;
@@ -23,6 +25,7 @@
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.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springblade.mdm.utils.EntityUtil;
import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
@@ -46,41 +49,21 @@
private final TaskService taskService;
private final IdentityService identityService;
private final FlowProgramFileService flowProgramFileService;
- private final ReplaceProgramFileService replaceProgramFileService;
+ private final ProgramFlowStatusQueryService flowStatusQueryService;
private final NodeDeptQueryService nodeDeptQueryService;
- private OssTemplate ossTemplate;
- public static final String NODE_ID = "nodeId";
+ private final FlowCommonService flowCommonService;
+ private final OssTemplate ossTemplate;
+ private final MachineService machineService;
+
/**
- * 杞淳锛屽苟璁板綍鑷繁鐨勫娉ㄤ俊鎭�
- * @param nodeId 鏇挎崲鐨勮妭鐐筰d
+ * 鍑嗗鏇挎崲娴佺▼闇�瑕佺殑鏁版嵁
+ * @param nodeId 瑕佹浛鎹㈢殑绋嬪簭鍖呭悕鑺傜偣id
+ * @param tempInstanceId 涓存椂娴佺▼瀹炰緥id锛岀敤浜庢柊鐨勬枃浠�
+ * @return 鍚姩鏁版嵁
*/
- /*
- @Transactional
- public void prestart(long nodeId,String tempInstanceId) {
- List<NcNode> fileNodes = nodeService.lambdaQuery()
- .eq(NcNode::getParentId, nodeId)
- .eq(NcNode::getIsLastEdition,1)
- .eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_FILE).list();
- List<Long> fileIds = fileNodes.stream().map(NcNode::getFlowProgramFileId).toList();
-
- List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery()
- .in(FlowProgramFile::getId, fileIds).list();
-
-
- //灏嗙幇鏈夋枃浠跺鍒跺埌鐙珛鐨勮〃涓紝鍚庣画浣滀负瀹℃壒鐨勬枃浠讹紝瀹℃壒鐣岄潰璋冪敤鐨勬帴鍙ｄ篃涓嶅悓锛屾渶濂藉崟鐙紑鍙�
- for(FlowProgramFile programFile : programFiles) {
- FlowProgramFile newFile = new FlowProgramFile();
- BeanUtils.copyProperties(programFile, newFile);
- EntityUtil.clearBaseProperties(newFile);
- newFile.setProcessInstanceId(tempInstanceId);
- flowProgramFileService.save(newFile);
- }
- }
-
- */
-
@Transactional
public NcNodeVO pre(long nodeId, String tempInstanceId) {
+ checkFlowStatus(nodeId);
List<NcNode> fileNodes = nodeService.lambdaQuery()
.eq(NcNode::getParentId, nodeId)
@@ -113,24 +96,36 @@
return vo;
}
+ void checkFlowStatus(long nodeId) {
+ NcNode packageNode = nodeService.getById(nodeId);
+ int status = flowStatusQueryService.queryFlowStatus(packageNode.getProcessInstanceId());
+ if (status == 1) {
+ throw new ServiceException("绋嬪簭鐨勬祦绋嬫鍦ㄨ繘琛屼腑锛屼笉鑳借繘琛屾浛鎹�");
+ }
+ }
+
/**
* 鍚姩鏇挎崲娴佺▼
*/
@Transactional
public void start(ReplaceFlowStartVO startVO){
+ NcNode programPackage = nodeService.getById(startVO.getNodeId());
Map<String, Object> vars = new HashMap<>();
- vars.put(FlowContants.ASSIGNEE,startVO.getAssignee());//绗竴涓鎵圭敤鎴�
+
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");
vars.put(FlowContants.TITLE,startVO.getTitle());
- NcNode programPackage = nodeService.getById(startVO.getNodeId());
+ //浠ヤ笅琚玣lowCommonService.putFlowVariablesByNode(vars,programPackage);浠ｆ浛浜�
+ /*
//鏈哄簥缂栧彿
vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
- //Machine machine = machineService.getByCode(programPackge.getMachineCode());
+ Machine machine = machineService.getByCode(programPackage.getMachineCode());
//鏈哄簥鍨嬪彿
- //if(machine != null) {
- //vars.put(FlowContants.MACHINE_MODE, programPackge.getMachineMode());
- //}
+ 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());
@@ -142,13 +137,16 @@
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
- vars.put(NODE_ID, startVO.getNodeId());
-
+ 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()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
- //replaceProgramFileService.lambdaUpdate().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).set(ReplaceProgramFile::getProcessInstanceId,inst.getProcessInstanceId());
-
+ //鏇存柊鑺傜偣鐨勬祦绋媔d锛岄伩鍏嶉噸澶嶅彂璧锋祦绋�
+ programPackage.setProcessInstanceId(inst.getId());
+ this.nodeService.updateById(programPackage);
/*
Task startTask = taskService.createTaskQuery()
.processInstanceId(inst.getId())
@@ -164,13 +162,13 @@
}
+
/**
* 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
* @param uploadVO 涓婁紶瀵硅薄
*/
public void uploadReplaceProgramFile(ReplaceUploadVO uploadVO) {
- //FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
MultipartFile file = uploadVO.getFile();
if(file.getSize() == 0){
throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
@@ -179,8 +177,10 @@
progProps.setDrawingNo(uploadVO.getDrawingNo());
progProps.setProcessNo(uploadVO.getProcessNo());
progProps.setProcessEdition(uploadVO.getProcessEdition());
+ if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
+ ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
+ }
- ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());
@@ -191,6 +191,7 @@
progFile.setOssName(bfile.getName());
progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
progFile.setProgramName(programName);
+ progFile.setFileType(uploadVO.getFileType());
flowProgramFileService.save(progFile);
--
Gitblit v1.9.3