From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001 From: admin <admin@admin.com> Date: 星期三, 22 一月 2025 12:20:44 +0800 Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) 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 2c02609..0c815d4 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def @@ -12,16 +12,26 @@ if ( not isnull( this.Data() ) ) { ries := this.Data(); - info( "鎵ц鐢ㄦ埛锛�", this.Data().ExecutionUserName(), " 鎵ц鐘舵�侊細", this.Data().ExecutionUserName(), " 鎵ц娑堟伅锛�", this.Data().ExecutionRespMessage() ); - - if ( ries.ExecutionIsSuccess() ) { - - } else { - if ( ries.ExecutionStatus() = "InProgress" ) { - bRequirementUpload.Image( "APPLICATION_STOP" ); - } else if ( ries.ExecutionStatus() = "Complete" ) { - bRequirementUpload.Image( "FLASH" ); - } + if ( ries.ExecutionCode() = 200 ) { + WebMessageBox::Success( ries.ExecutionRespMessage() ); + bRequirementUpload.Image( "FLASH" ); + bRequirementUpload.Enabled( true, "" ); + }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, "" ); + } else if ( ries.ExecutionCode() = 501 ) { + dlg := construct( DialogOverwriteFile ); + ApplicationMacroPlanner.ShowFormModal( dlg ); + bRequirementUpload.Image( "FLASH" ); + bRequirementUpload.Enabled( true, "" ); + } else if ( ries.ExecutionCode() = -1 ) { + bRequirementUpload.Image( "APPLICATION_STOP" ); + bRequirementUpload.Enabled( false, "" ); } this.Data().Delete(); -- Gitblit v1.9.3