From fcee672452c02cc29e0e17ebc27a8c51698c6d0d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 17:28:44 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
index ba05c3c..4288c15 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
@@ -108,14 +108,22 @@
byteStream.reset();
//AnnotationProcessor processor = annoProcessHelper.getProcessor(machine.getControlSystem());
- String lgLine = FileContentUtil.readLineAt(byteStream,annoProps.getDeviationLineIndex());
- String textWithoutAnno = AnnotationUtil.removeAnnotation(machine.getControlSystem(),lgLine,programAnnotationService.getAnnotionDictList());
- String[] strArr = Func.split(textWithoutAnno,":");//涓存椂鏇存敼鍗曟槸鍐掑彿鍒嗛殧锛屽悗闈㈡槸鍗曞彿
+
+ String planStatusLine = AnnotationUtil.removeAnnotation(machine.getControlSystem(),FileContentUtil.readLineAt(byteStream,annoProps.getStatusLineIndex()),programAnnotationService.getAnnotionDictList());
+
+ String lgNo;//鏇存敼鍗曞彿
+ if(AnnotationUtil.LG.equals(planStatusLine)) {//鏄洿鏀瑰崟
+ String lgLine = FileContentUtil.readLineAt(byteStream, annoProps.getDeviationLineIndex());
+ lgNo = AnnotationUtil.removeAnnotation(machine.getControlSystem(), lgLine, programAnnotationService.getAnnotionDictList());
+ }else{
+ lgNo = null;
+ }
+
long progOnMachineCount = programOnMachineService.lambdaQuery()
.eq(ProgramOnMachine::getDrawingNo,progNameVO.getDrawingNo())
.eq(ProgramOnMachine::getProcessNo,progNameVO.getProcessNo())
.eq(ProgramOnMachine::getProcessEdition,progNameVO.getProcessEdition())
- .eq(strArr.length==2,ProgramOnMachine::getDeviation,strArr[1])//涓存椂鏇存敼鍗曞尮閰�
+ .eq(lgNo != null,ProgramOnMachine::getDeviation,lgNo)//涓存椂鏇存敼鍗曞尮閰�
.eq(ProgramOnMachine::getMachineCode,machineFile.getMachineCode()).count();
--
Gitblit v1.9.3