From 675d66f1cbc7e92cc0fb4897664ee3a851072334 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 00:06:35 +0800
Subject: [PATCH] 优化固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 f9ce583..366d803 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
@@ -13,7 +13,7 @@
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.constants.FlowConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
@@ -21,10 +21,7 @@
import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
-import org.springblade.mdm.program.service.programannotation.AnnotationData;
-import org.springblade.mdm.program.service.programannotation.AnnotationProcessor;
-import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;
-import org.springblade.mdm.program.service.programannotation.ProcessorHelper;
+import org.springblade.mdm.program.service.programannotation.*;
import org.springblade.system.feign.IDictClient;
import org.springframework.stereotype.Service;
@@ -68,13 +65,16 @@
approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
approvedService.updateById(approved);
- NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
- if(pkgNode.isDeviationProgram()){
+ NcNodeHis pkgNodeHis = this.ncNodeHisService.getById(approved.getNcNodeId());
+ if(pkgNodeHis.isDeviationProgram()){
//鍋忕鍗曠殑绋嬪簭锛屽鏋滃鎵瑰鍑鸿褰曟槸瑙ｉ攣褰㈡垚鐨勶紝杩樻槸闇�瑕侀攣瀹氾紱鏅�氳瘯鍒囪繃鐨勶紝涓嶉攣瀹�
HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();
- if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
- pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
- ncNodeService.updateById(pkgNode);
+ if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){
+ NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
+ if(pkgNode != null) {
+ pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
+ ncNodeService.updateById(pkgNode);
+ }
}
}
}
@@ -105,11 +105,11 @@
FlowProgramFile programFile;
NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
- String status = "SQ";
+ String status = AnnotationUtil.SQ;
if(programPackageNode.isDeviationProgram()){
- status = "PL";
+ status = AnnotationUtil.LG;
}else if(programPackageNode.hasCured()){
- status = "GH";
+ status = AnnotationUtil.GH;
}
long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
if(packageNodeHis.isDeviationProgram()) {
@@ -179,7 +179,7 @@
* @param zipOut zip杈撳嚭娴�
* @param inputStream 杈撳叆娴�
* @param entryName 鏂囦欢鍚�
- * @throws IOException
+ * @throws IOException 鍐欐枃浠跺紓甯�
*/
void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
throws IOException {
--
Gitblit v1.9.3