From 224bc6082b06f53755ee7e834d78e17f51cb0fa2 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期二, 15 十月 2024 16:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_Archive/StaticMethod_Archive.qbl | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_Archive.qbl b/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
index e23e3a4..26bd4bd 100644
--- a/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
@@ -23,42 +23,42 @@
filePath := archiveFileJSON.Get( "fileFullPath" ).GetString();
if ( archiveType = "PR" ) {
- apr := select( archive, ArchivePR, tempAPR, tempAPR.Name() = fileName );
+ apr := select( archive, ArchiveFile.astype( ArchivePR ), tempAPR, tempAPR.Name() = fileName );
if ( not isnull( apr ) ) {
apr.FilePath( filePath );
} else {
- archive.ArchivePR( relnew, Name := fileName, FilePath := filePath );
+ archive.ArchiveFile( relnew,ArchivePR, Name := fileName, FilePath := filePath );
}
} else if ( archiveType = "PP" ) {
- app := select( archive, ArchivePP, tempAPP, tempAPP.Name() = fileName );
+ app := select( archive, ArchiveFile.astype( ArchivePP ), tempAPP, tempAPP.Name() = fileName );
if ( not isnull( app ) ) {
app.FilePath( filePath );
} else {
- archive.ArchivePP( relnew, Name := fileName, FilePath := filePath );
+ archive.ArchiveFile( relnew,ArchivePP, Name := fileName, FilePath := filePath );
}
} else if ( archiveType = "Budget" ) {
- ab := select( archive, ArchiveBudget, tempAB, tempAB.Name() = fileName );
+ ab := select( archive, ArchiveFile.astype( ArchiveBudget ), tempAB, tempAB.Name() = fileName );
if ( not isnull( ab ) ) {
ab.FilePath( filePath );
} else {
- archive.ArchiveBudget( relnew, Name := fileName, FilePath := filePath );
+ archive.ArchiveFile( relnew,ArchiveBudget, Name := fileName, FilePath := filePath );
}
} else if ( archiveType = "PPA" ) {
// 瀛樻。PPA
- appa := select( archive, ArchivePPA, tempAPPA, tempAPPA.Name() = fileName );
+ appa := select( archive, ArchiveFile.astype( ArchivePPA ), tempAPPA, tempAPPA.Name() = fileName );
if ( not isnull( appa ) ) {
appa.FilePath( filePath );
appa.SourceFileBinaryValue( ppaBinaryValue );
} else {
- archive.ArchivePPA( relnew, Name := fileName, FilePath := filePath, SourceFileBinaryValue := ppaBinaryValue );
+ archive.ArchiveFile( relnew,ArchivePPA, Name := fileName, FilePath := filePath, SourceFileBinaryValue := ppaBinaryValue );
}
// 瀛樻。Curve
- ac := select( archive, ArchiveCurve, tempAC, true );
+ ac := select( archive, ArchiveFile.astype( ArchiveCurve ), tempAC, true );
if ( not isnull( ac ) ) {
ac.Delete();
}
- archive.ArchiveCurve( relnew, Name := "濮嬬粓鍙瓨涓�鐗�.xlsx", FilePath := curveFileName, SourceFileBinaryValue := curveBinaryValue );
+ archive.ArchiveFile( relnew,ArchiveCurve, Name := "濮嬬粓鍙瓨涓�鐗�.xlsx", FilePath := curveFileName, SourceFileBinaryValue := curveBinaryValue );
}
}
}
--
Gitblit v1.9.3