From b0612bf1f3bbd4640b36f2db6ccb166ecae69d37 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 31 五月 2024 17:13:31 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
index e61f9a7..04ca4cf 100644
--- a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
@@ -38,25 +38,25 @@
if ( prBinaryValue.Size() > 0 ) {
archive -> Archive::HandlePR( macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath, isOverwriteFile )
-> Archive::Success( macroPlan, archiveExecutionStatus, userName )
- -> Archive::Archive( archive, "PR" )
+ -> Archive::Archive( archive, "PR", ppaBinaryValue, curveFileName, curveBinaryValue )
-> Exception()
-> Archive::OnException( archiveExecutionStatus, userName );
} else if ( ppBinaryValue.Size() > 0 ) {
archive -> Archive::HandlePP( macroPlan, userName, ppFileName, ppBinaryValue, isPPArchive, filePath, isOverwriteFile )
-> Archive::Success( macroPlan, archiveExecutionStatus, userName )
- -> Archive::Archive( archive, "PP" )
+ -> Archive::Archive( archive, "PP", ppaBinaryValue, curveFileName, curveBinaryValue )
-> Exception()
-> Archive::OnException( archiveExecutionStatus, userName );
} else if ( budgetBinaryValue.Size() > 0 ) {
archive -> Archive::HandleBudget( macroPlan, userName, budgetFileName, budgetBinaryValue, isBudgetArchive, filePath, isOverwriteFile )
-> Archive::Success( macroPlan, archiveExecutionStatus, userName )
- -> Archive::Archive( archive, "Budget" )
+ -> Archive::Archive( archive, "Budget", ppaBinaryValue, curveFileName, curveBinaryValue )
-> Exception()
-> Archive::OnException( archiveExecutionStatus, userName );
} else {
archive -> Archive::HandlePPA_Curve_IDS( macroPlan, userName, ppaFileName, ppaBinaryValue, isPPAArchive, curveFileName, curveBinaryValue, idsFileName, idsBinaryValue, filePath, isOverwriteFile )
-> Archive::Success( macroPlan, archiveExecutionStatus, userName )
- -> Archive::Archive( archive, "PPA" )
+ -> Archive::Archive( archive, "PPA", ppaBinaryValue, curveFileName, curveBinaryValue )
-> Exception()
-> Archive::OnException( archiveExecutionStatus, userName );
}
--
Gitblit v1.9.3