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/ReplaceFlowService.java | 154 ++++++++++++++++++++++++++++++---------------------
1 files changed, 91 insertions(+), 63 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 c1d1eef..687a529 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
@@ -1,77 +1,96 @@
package org.springblade.mdm.flow.service;
import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.simpleframework.xml.core.Replace;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.oss.model.BladeFile;
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.machine.service.MachineService;
import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.entity.ReplaceProgramFile;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
-import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.flow.vo.ReplaceUploadVO;
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;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
@AllArgsConstructor
@Service
public class ReplaceFlowService {
private final NcNodeService nodeService;
- private final TaskService taskService;
private final RuntimeService runtimeService;
+ 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 final FlowCommonService flowCommonService;
+ private final OssTemplate ossTemplate;
private final MachineService machineService;
- public static final String NODE_ID = "nodeId";
/**
- * 杞淳锛屽苟璁板綍鑷繁鐨勫娉ㄤ俊鎭�
- * @param nodeId 鏇挎崲鐨勮妭鐐筰d
+ * 鍑嗗鏇挎崲娴佺▼闇�瑕佺殑鏁版嵁
+ * @param nodeId 瑕佹浛鎹㈢殑绋嬪簭鍖呭悕鑺傜偣id
+ * @param tempInstanceId 涓存椂娴佺▼瀹炰緥id锛岀敤浜庢柊鐨勬枃浠�
+ * @return 鍚姩鏁版嵁
*/
@Transactional
- public void pre(long nodeId,String tempInstanceId) {
+ public NcNodeVO pre(long nodeId, String tempInstanceId) {
+ checkFlowStatus(nodeId);
+
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();
-
+ if(fileIds.isEmpty()){
+ throw new RuntimeException("鏈壘鍒扮▼搴忔枃浠�");
+ }
List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery()
.in(FlowProgramFile::getId, fileIds).list();
//灏嗙幇鏈夋枃浠跺鍒跺埌鐙珛鐨勮〃涓紝鍚庣画浣滀负瀹℃壒鐨勬枃浠讹紝瀹℃壒鐣岄潰璋冪敤鐨勬帴鍙ｄ篃涓嶅悓锛屾渶濂藉崟鐙紑鍙�
for(FlowProgramFile programFile : programFiles) {
- /*
- ReplaceProgramFile replaceProgramFile = new ReplaceProgramFile();
- BeanUtils.copyProperties(programFile, replaceProgramFile);
- EntityUtil.clearBaseProperties(replaceProgramFile);
- replaceProgramFile.setTempId(tempId);
-
- replaceProgramFileService.save(replaceProgramFile);
-
- */
FlowProgramFile newFile = new FlowProgramFile();
BeanUtils.copyProperties(programFile, newFile);
EntityUtil.clearBaseProperties(newFile);
newFile.setProcessInstanceId(tempInstanceId);
flowProgramFileService.save(newFile);
+ }
+
+ NcNode node = nodeService.getById(nodeId);
+ NcNodeVO vo = new NcNodeVO();
+ BeanUtils.copyProperties(node, vo);
+ vo.setProcessInstanceId(tempInstanceId);
+
+ vo.setWorkshop(nodeDeptQueryService.getWorkshopNameByMachineCode(node.getMachineCode()));
+
+ return vo;
+ }
+
+ void checkFlowStatus(long nodeId) {
+ NcNode packageNode = nodeService.getById(nodeId);
+ int status = flowStatusQueryService.queryFlowStatus(packageNode.getProcessInstanceId());
+ if (status == 1) {
+ throw new ServiceException("绋嬪簭鐨勬祦绋嬫鍦ㄨ繘琛屼腑锛屼笉鑳借繘琛屾浛鎹�");
}
}
@@ -80,59 +99,68 @@
*/
@Transactional
public void start(ReplaceFlowStartVO startVO){
+ flowProgramFileService.checkProgramFiles(startVO.getTempInstanceId(),true);
+ 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 programPackge = nodeService.getById(startVO.getNodeId());
- //鏈哄簥缂栧彿
- vars.put(FlowContants.MACHINE_CODE,programPackge.getMachineCode());
- //Machine machine = machineService.getByCode(programPackge.getMachineCode());
- //鏈哄簥鍨嬪彿
- //if(machine != null) {
- //vars.put(FlowContants.MACHINE_MODE, programPackge.getMachineMode());
- //}
- vars.put(FlowContants.PROCESS_NO,programPackge.getProcessNo());
- vars.put(FlowContants.PROCESS_NAME,programPackge.getProcessName());
- vars.put(FlowContants.PROCESS_EDITION,programPackge.getProcessEdition());
- vars.put(FlowContants.CRAFT_EDITION,programPackge.getCraftEdition());
- vars.put(FlowContants.DRAWING_NO,programPackge.getDrawingNo());
- vars.put(FlowContants.DRAWING_NO_EDITION,programPackge.getDrawingNoEdition());
+ vars.put("comment", startVO.getComment());
+ vars.put(FlowContants.MY_PROCESS_NAME,"鏇挎崲娴佺▼");
- vars.put(FlowContants.PRODUCT_MODEL,programPackge.getProductModel());
- vars.put(NODE_ID, startVO.getNodeId());
- identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
+ String userId = String.valueOf(AuthUtil.getUserId());
+ identityService.setAuthenticatedUserId(userId);//璁剧疆娴佺▼鍙戣捣浜�
+ vars.put(FlowVariableContants.ACT_PROGRAMMER,userId);//鍙戣捣浜烘寜鐓у疄闄呯紪绋嬩汉鍛樼畻
+
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);
flowProgramFileService.lambdaUpdate()
.eq(FlowProgramFile::getProcessInstanceId,startVO.getTempInstanceId())
.set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();
- /*
- List<ReplaceProgramFile> repFiles = replaceProgramFileService.lambdaQuery().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).list();
-
- for(ReplaceProgramFile repFile : repFiles) {
- FlowProgramFile flowProgramFile = new FlowProgramFile();
- BeanUtils.copyProperties(repFile, flowProgramFile);
- flowProgramFile.setProgramName(programPackge.getName());
-
- EntityUtil.clearBaseProperties(flowProgramFile);
- flowProgramFile.setProcessInstanceId(inst.getId());
- flowProgramFile.setIsCured(0);
-
- flowProgramFileService.save(flowProgramFile);
- }
-
- //鏆傛椂娉ㄩ噴锛屾祴璇曟柟渚�
- replaceProgramFileService.deleteByTempId(startVO.getTempId());
-
- */
- //return inst.getProcessInstanceId();
}
+
+ /**
+ * 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
+ * @param uploadVO 涓婁紶瀵硅薄
+ */
+ public void uploadReplaceProgramFile(ReplaceUploadVO uploadVO) {
+
+ MultipartFile file = uploadVO.getFile();
+ if(file.getSize() == 0){
+ throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
+ }
+ FlowProgramProperties progProps = new FlowProgramProperties();
+ progProps.setDrawingNo(uploadVO.getDrawingNo());
+ progProps.setProcessNo(uploadVO.getProcessNo());
+ progProps.setProcessEdition(uploadVO.getProcessEdition());
+ if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
+ ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
+ }
+
+
+ String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo(),progProps.getProcessEdition());
+
+ BladeFile bfile = ossTemplate.putFile(file);
+
+ FlowProgramFile progFile = new FlowProgramFile();
+ progFile.setName(file.getOriginalFilename());
+ progFile.setOssName(bfile.getName());
+ progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
+ progFile.setProgramName(programName);
+ progFile.setFileType(uploadVO.getFileType());
+
+ flowProgramFileService.save(progFile);
+
+ }
}
--
Gitblit v1.9.3