From 79e81a02076cdd1e828eb06029cd51eb37522f42 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 09:11:37 +0800
Subject: [PATCH] 首页下载问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 7e9e87e..f9ce583 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -6,14 +6,18 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.oss.OssTemplate;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
@@ -22,7 +26,6 @@
import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;
import org.springblade.mdm.program.service.programannotation.ProcessorHelper;
import org.springblade.system.feign.IDictClient;
-import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
import java.io.*;
@@ -44,9 +47,10 @@
private final MachineService machineService;
private final NcProgramApprovedService approvedService;
private final NcNodeService ncNodeService;
+ private final NcNodeHisService ncNodeHisService;
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
- private final ProgramAnnotationService programAnnotationService;
+ private final HistoryService historyService;
private final MachineAnnotationConfig annotationConfig;
/**
@@ -63,6 +67,16 @@
approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
approvedService.updateById(approved);
+
+ NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
+ if(pkgNode.isDeviationProgram()){
+ //鍋忕鍗曠殑绋嬪簭锛屽鏋滃鎵瑰鍑鸿褰曟槸瑙ｉ攣褰㈡垚鐨勶紝杩樻槸闇�瑕侀攣瀹氾紱鏅�氳瘯鍒囪繃鐨勶紝涓嶉攣瀹�
+ HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();
+ if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
+ pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
+ ncNodeService.updateById(pkgNode);
+ }
+ }
}
}catch(Exception e){
@@ -77,19 +91,20 @@
* @param approved
*/
private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{
- NcNode packageNode = ncNodeService.getById(approved.getNcNodeId());
+ NcNodeHis packageNodeHis = ncNodeHisService.getById(approved.getNcNodeId());
- String packageFolder = packageNode.getName()+"/";
+ String packageFolder = packageNodeHis.getName()+"/";
ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"缁撳熬琛ㄧず鏂囦欢澶�
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
- Machine machine = machineService.getByCode(packageNode.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+ Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
- List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
+ //List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
+ List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
- NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
+ NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
String status = "SQ";
if(programPackageNode.isDeviationProgram()){
status = "PL";
@@ -97,12 +112,12 @@
status = "GH";
}
long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
- if(packageNode.isDeviationProgram()) {
- deviationSerial = ncNodeService.getDeviationSerialForNode(packageNode);
+ if(packageNodeHis.isDeviationProgram()) {
+ deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
}
//List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
- for (NcNode node : programNodes) {
+ for (NcNodeHis node : programNodes) {
String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
if(programFile.isProgram()) {//绋嬪簭鏂囦欢锛屾墠浼氬姞鍏ュ帇缂╁寘
@@ -115,7 +130,7 @@
annoData.setProgramStatus(status);
annoData.setDeviation(programPackageNode.getDeviation());
annoData.setFilename(programFile.getName());
- InputStream addedInsFinal = annoProcessor.setAnnotation(annoData,inputStream);
+ InputStream addedInsFinal = annoProcessor.putAnnotation(annoData,inputStream);
addedInsFinal.reset();
/*
InputStream addedInsFinal;
@@ -139,7 +154,7 @@
* @param deviationSerial 鍋忕鍗曞簭鍙�
* @return zip涓殑鏂囦欢璺緞
*/
- String genFilePathInZip(String packageFolder,NcNode programNode,long deviationSerial){
+ String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
//涓烘枃浠跺悕澧炲姞鍋忕鍗曞彿
String filePathInZip;
--
Gitblit v1.9.3