From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java
index cbbbe9b..73d9014 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java
@@ -4,18 +4,19 @@
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.log.exception.ServiceException;
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.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@AllArgsConstructor
@@ -24,51 +25,54 @@
private final NcNodeService nodeService;
private final RuntimeService runtimeService;
private final IdentityService identityService;
- private final MachineService machineService;
private final ProduceDivisionService produceDivisionService;
-
-
+ private final FlowCommonService flowCommonService;
+ private final FlowProgramFileService flowProgramFileService;
/**
* 鍚姩瑙ｉ攣娴佺▼
*/
@Transactional
- public void startUnlock(Long nodeId){
+ public void startUnlock(Long nodeId,String unlockReason){
NcNode programPackage = nodeService.getById(nodeId);
+ if(flowCommonService.isProcessInstanceActive(programPackage.getProcessInstanceId())){
+ throw new ServiceException("娴佺▼姝ｅ湪杩涜");
+ }
Map<String, Object> vars = new HashMap<>();
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
+ vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowContants.SENIOR,div.getSeniorId());
vars.put(FlowContants.ASSIGNEE,div.getSeniorId());//瀹℃壒鐢ㄦ埛:楂樺笀
vars.put(FlowContants.TITLE,programPackage.getName()+"绋嬪簭瑙ｉ攣");
- //鏈哄簥缂栧彿
- 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, nodeId);
-
- vars.put("comment", "add on start");
+ vars.put(FlowContants.MY_PROCESS_NAME,"瑙ｉ攣娴佺▼");
+ vars.put("comment", "瑙ｉ攣绋嬪簭"+programPackage.getName());
+ vars.put("unlockReason", unlockReason);
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,nodeId+"",vars);
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.UNLOCK_PROCESS_KEY,nodeId+"",vars);
programPackage.setProcessInstanceId(inst.getId());
this.nodeService.updateById(programPackage);
+
+ //鏇存柊鑺傜偣鏂囦欢鐨勬祦绋嬪疄渚媔d
+
+ updateFlowProgramFilesProcessInstance(programPackage);
}
+ /**
+ * 鏇存柊鎵�灞炴祦绋嬫枃浠剁殑娴佺▼瀹炰緥id
+ * @param programPackage 瑕佽В閿佺殑绋嬪簭鎶ュ悕鑺傜偣
+ */
+ void updateFlowProgramFilesProcessInstance(NcNode programPackage){
+ List<NcNode> fileNodes = nodeService.getProgramFilesByPackageId(programPackage.getId());
+ List<Long> fileIds = fileNodes.stream().map(NcNode::getFlowProgramFileId).toList();
+ if(!fileIds.isEmpty()){
+ flowProgramFileService.lambdaUpdate().in(FlowProgramFile::getId, fileIds)
+ .set(FlowProgramFile::getProcessInstanceId, programPackage.getProcessInstanceId()).update();
+ }
+ }
}
--
Gitblit v1.9.3