From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
index 5bcd37e..9fc4ea6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
@@ -137,12 +137,15 @@
* @param text 娓呴櫎娉ㄩ噴鏍囪
* @return 娓呴櫎鍚庣殑鏂囨湰
*/
- public String removeAnnotation(String machineGroupCode,String text){
- List<DictBiz> annoDicts = getAnnotionDictList();
- ProgramAnnotation panno = this.getProgramAnnotationFormat(machineGroupCode,annoDicts);
- //String[] arr = getAnnotationStartAndEnd(machineGroupCode,annoDicts);
- return panno.cleanAnnotation(text);
- }
+ public String removeAnnotation(String machineGroupCode,String text){
+ List<DictBiz> annoDicts = getAnnotionDictList();
+ return removeAnnotation(machineGroupCode,text,annoDicts);
+ }
+
+ public String removeAnnotation(String machineGroupCode,String text,List<DictBiz> annotatiionList){
+ ProgramAnnotation panno = this.getProgramAnnotationFormat(machineGroupCode,annotatiionList);
+ return panno.cleanAnnotation(text);
+ }
/**
* 璁剧疆鍥哄寲娉ㄩ噴琛�
* @param inputStream 杈撳叆妗�
--
Gitblit v1.9.3