From d2ec6798fa2cc711abd8c4e0bad8e4dbe431ddcc Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 01 十一月 2023 09:49:13 +0800
Subject: [PATCH] Merge branch 'dev' into dev_lrs

---
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def
index 1ea13f8..12efac1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def
@@ -13,7 +13,11 @@
   {
     Body:
     [*
-      H_FunctionClass::SM_OrderHedgingEx( MacroPlan, ApplicationMacroPlanner.GetUserName() );
+      //H_FunctionClass::SM_OrderHedgingEx( MacroPlan, ApplicationMacroPlanner.GetUserName() );
+      
+      FillingCapacityOrder::OrderOffset( MacroPlan );
+      
+      WebMessageBox::Success( "鍐插噺鎴愬姛锛侊紒锛�", true );
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3