From 8e3281d6344b5e072e4a1448eebf6d12e042bdb4 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 27 五月 2024 18:00:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
index 3fca737..f482917 100644
--- a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
@@ -2,6 +2,7 @@
 #parent: #root
 StaticMethod RequirementProcessing (
   Archive archive,
+  ArchiveExecutionStatus archiveExecutionStatus,
   MacroPlan macroPlan,
   String userName,
   String prFileName,
@@ -28,12 +29,12 @@
     OS::CreateDirectory( filePath );
     
     // 鍒涘缓鎵ц鐘舵��
-    archive.RequirementImportExecutionStatus( relnew, 
-                                              ExecutionStatus    := "InProgress",
-                                              ExecutionUserName  := userName );
+    archiveExecutionStatus.RequirementImportExecutionStatus( relnew, 
+                                                             ExecutionStatus    := "InProgress",
+                                                             ExecutionUserName  := userName );
     
     if ( prBinaryValue.Size() > 0 ) {
-      archive -> Archive::HandlePR( macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath );
+      archive -> Archive::HandlePR( macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath ) ->Archive::Success() -> Exception() -> Archive::OnException( archiveExecutionStatus, userName );
     } else if ( ppBinaryValue.Size() > 0 ) {
       Archive::HandlePP( archive, macroPlan, userName, ppFileName, ppBinaryValue, isPPArchive, filePath );
     } else if ( budgetBinaryValue.Size() > 0 ) {

--
Gitblit v1.9.3