From 30c02e0c981b16be0918483543f4b812956c45d4 Mon Sep 17 00:00:00 2001
From: Lai,Risheng <risheng.lai@capgemini.com>
Date: 星期四, 02 十一月 2023 10:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_PanelInterfaceTest_ButtonPullInterfaceDataToIntermediateTable_OnCli.def |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_PanelInterfaceTest_ButtonPullInterfaceDataToIntermediateTable_OnCli.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_PanelInterfaceTest_ButtonPullInterfaceDataToIntermediateTable_OnCli.def
index 6dfbdbe..c8b3ff8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_PanelInterfaceTest_ButtonPullInterfaceDataToIntermediateTable_OnCli.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_PanelInterfaceTest_ButtonPullInterfaceDataToIntermediateTable_OnCli.def
@@ -7,12 +7,20 @@
   DefinitionID: 'Responsedef_WebButton_OnClick'
   Precondition:
   [*
-    return not isnull( GlobalOTDTable );
+    flag := not isnull( GlobalOTDTable );
+    
+    if ( not isnull( GlobalOTDTable ) ) {
+      
+    }
+    
+    return flag;
   *]
   QuillAction
   {
     Body:
     [*
+      WebMessageBox::Information( "鏁版嵁寮�濮嬫媺鍙栦腑锛侊紙浠呴檺涓�浜烘搷浣滐級", true );
+      
       GlobalOTDTable.SynchronizationAllMappingBrokerAndAPIByOption( ApplicationMacroPlanner.GetUserName(),
                                                                     CheckboxCustomOrder.Checked(),
                                                                     CheckboxForecast.Checked(),
@@ -34,8 +42,6 @@
                                                                     CheckboxCurrencyRate_MP.Checked(),
                                                                     CheckboxLane.Checked(),
                                                                     CheckboxLaneLeg.Checked() );
-      
-      WebMessageBox::Information( "鏁版嵁寮�濮嬫媺鍙栦腑锛侊紙浠呴檺涓�浜烘搷浣滐級", true );
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3