From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 d27d9f4..c955ac7 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
@@ -3,6 +3,7 @@
import com.qiniu.util.IOUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -65,7 +66,6 @@
return;
}
- AnnotationProperties annoProps = AnnotationProperties.getDefault();
try(InputStream fileIns = Files.newInputStream(checkFilePath);) {
int excepType = MachineFile.EXCEPTION_OK;
ByteArrayInputStream byteStream = new ByteArrayInputStream(IOUtils.toByteArray(fileIns));
@@ -73,13 +73,13 @@
//闈炴枃鏈�
excepType = MachineFile.EXCEPTION_NOT_TEXT;
}else{
- Matcher matcher = RegExpConstants.PROGRAM_FILE_PATTERN.matcher(machineFile.getName());
-
- boolean filenameValid = matcher.find();
+ //Matcher matcher = RegExpConstants.PROGRAM_FILE_PATTERN.matcher(machineFile.getName());
+ ProgramNameVO progNameVO = ProgramFileNameParser.parseProgramName(machineFile.getName());
+ boolean filenameValid = progNameVO.isValidFilename();
if(!filenameValid){
excepType = MachineFile.EXCEPTION_BAD_FILENAME;
}else {
- ProgramNameVO progNameVO = ProgramFileNameParser.parseProgramName(machineFile.getName());
+
String prefix = progNameVO.logicProgramName()+"-";
long matchCount = allFilesInDir.stream().filter(file -> file.getName().startsWith(prefix)).count();
if(matchCount != progNameVO.getSegmentCount()){//鏂囦欢娈垫暟缂哄け
@@ -87,11 +87,18 @@
}else{
//妫�鏌ユ槸鍚﹀尮閰嶄笅鍙戣褰曠殑娈垫暟
//姝ｈ礋3绉掍綔涓烘煡璇㈡椂闂�
- Date beginTime = new Date(machineFile.getFileCreateTime().getTime()-3000);
- Date endTime = new Date(machineFile.getFileCreateTime().getTime()+3000);
+ //Date beginTime = new Date(machineFile.getFileCreateTime().getTime()-3000);
+ //Date endTime = new Date(machineFile.getFileCreateTime().getTime()+3000);
+ String likeStr;
+ if(StringUtils.isNotBlank(progNameVO.getLgPart())){
+ likeStr = prefix +"%P%";
+ }else{
+ likeStr = prefix;
+ }
Optional<FileSendRecord> optFile = fileSendRecordService.lambdaQuery()
.eq(FileSendRecord::getMachineCode,machineFile.getMachineCode())
- .likeRight(FileSendRecord::getName,prefix).between(FileSendRecord::getCreateTime,beginTime,endTime).oneOpt();
+ .likeRight(FileSendRecord::getName,likeStr).last("limit 1")
+ .orderByDesc(FileSendRecord::getCreateTime).oneOpt();
boolean matchSendRecord;//鏂囦欢鏄惁鏈変笅鍙戣褰�
if(optFile.isPresent()){
@@ -102,6 +109,8 @@
if(progNameVO.getSegmentCount() != sendProgNameVO.getSegmentCount()){
//娈垫暟涓嶅尮閰嶄笅鍙戣褰�
excepType = MachineFile.EXCEPTION_NOT_MATCH_SEND_SEG_COUNT;
+ }else if(!StringUtils.equals(sendProgNameVO.getLgPart(),progNameVO.getLgPart())){
+ excepType = MachineFile.EXCEPTION_NOT_MATCH_SEND_LG;
}
}else{
matchSendRecord = false;
@@ -109,6 +118,8 @@
if(!matchSendRecord){//濡傛灉鏂囦欢鏈笅鍙戣繃锛屾煡鐪嬫槸鍚︽湁鐜板満缂栫▼璁板綍
byteStream.reset();
+
+ /*
String planStatusLine = AnnotationUtil.removeAnnotation(machine.getControlSystem(),FileContentUtil.readLineAt(byteStream,annoProps.getStatusLineIndex()),programAnnotationService.getAnnotionDictList());
String lgNo;//鏇存敼鍗曞彿
@@ -117,14 +128,17 @@
lgNo = AnnotationUtil.removeAnnotation(machine.getControlSystem(), lgLine, programAnnotationService.getAnnotionDictList());
}else{
lgNo = null;
- }
+ }*/
+ String devSerial = null;
+ if(StringUtils.isNotBlank(progNameVO.getLgPart())){
+ devSerial = progNameVO.getLgPart().substring(1);
+ }
long progOnMachineCount = programOnMachineService.lambdaQuery()
.eq(ProgramOnMachine::getDrawingNo,progNameVO.getDrawingNo())
.eq(ProgramOnMachine::getProcessNo,progNameVO.getProcessNo())
.eq(ProgramOnMachine::getProcessEdition,progNameVO.getProcessEdition())
- .eq(lgNo != null,ProgramOnMachine::getDeviation,lgNo)//涓存椂鏇存敼鍗曞尮閰�
-
+ .eq(devSerial != null,ProgramOnMachine::getDeviationSerial,devSerial)
.eq(ProgramOnMachine::getMachineCode,machineFile.getMachineCode()).count();
if(progOnMachineCount == 0){//鏃犵幇鍦虹紪绋嬭褰�
--
Gitblit v1.9.3