From d22759d24fb176f6e7b63f77eec7981616571e46 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 04 九月 2024 18:38:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def | 6 +++++-
_Main/BL/Type_Archive/StaticMethod_Success.qbl | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_Success.qbl b/_Main/BL/Type_Archive/StaticMethod_Success.qbl
index 2e39f8a..56e0029 100644
--- a/_Main/BL/Type_Archive/StaticMethod_Success.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_Success.qbl
@@ -12,7 +12,7 @@
code := respJSON.Get( "code" ).GetNumber();
message := respJSON.Get( "message" ).GetString();
- if ( code = 200 ) { // 鎵ц鎴愬姛锛屽鐞嗛渶姹�
+ if ( code = 200 or code = 201 ) { // 鎵ц鎴愬姛锛屽鐞嗛渶姹�
// 鑾峰彇闇�姹�
archiveExecutionStatus.AES_TemporaryDemandData().Execute();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def
index 4afacaf..0c815d4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def
@@ -16,7 +16,11 @@
WebMessageBox::Success( ries.ExecutionRespMessage() );
bRequirementUpload.Image( "FLASH" );
bRequirementUpload.Enabled( true, "" );
- } else if ( ries.ExecutionCode() = 500 ) {
+ }else if ( ries.ExecutionCode() = 201 ){
+ WebMessageBox::Warning( ries.ExecutionRespMessage() ,Translations::MessageBox_OKCancel());
+ bRequirementUpload.Image( "FLASH" );
+ bRequirementUpload.Enabled( true, "" );
+ }else if ( ries.ExecutionCode() = 500 ) {
WebMessageBox::Error( ries.ExecutionRespMessage() );
bRequirementUpload.Image( "FLASH" );
bRequirementUpload.Enabled( true, "" );
--
Gitblit v1.9.3