From 91413a3e42e7df36207ece0c7908a7dbb9b8727a Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期四, 30 五月 2024 17:07:29 +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 | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl index b03e1bd..e61f9a7 100644 --- a/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl +++ b/_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl @@ -37,21 +37,28 @@ if ( prBinaryValue.Size() > 0 ) { archive -> Archive::HandlePR( macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath, isOverwriteFile ) - -> Archive::Success( macroPlan, archiveExecutionStatus, userName ) + -> Archive::Success( macroPlan, archiveExecutionStatus, userName ) + -> Archive::Archive( archive, "PR" ) -> 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::Success( macroPlan, archiveExecutionStatus, userName ) + -> Archive::Archive( archive, "PP" ) -> 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 ) - -> Exception() + -> Archive::Success( macroPlan, archiveExecutionStatus, userName ) + -> Archive::Archive( archive, "Budget" ) + -> Exception() -> Archive::OnException( archiveExecutionStatus, userName ); } else { - Archive::HandlePPA_Curve_IDS( archive, macroPlan, userName, ppaFileName, ppaBinaryValue, isPPAArchive, curveFileName, curveBinaryValue, idsFileName, idsBinaryValue, filePath ); + 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" ) + -> Exception() + -> Archive::OnException( archiveExecutionStatus, userName ); } *] } -- Gitblit v1.9.3