From 462215553c754d26acde8edab81b4a73f774e21e Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期五, 13 十月 2023 11:20:48 +0800
Subject: [PATCH] Merge branch 'dev'

---
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def
index 8011270..692a6ad 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def
@@ -10,18 +10,17 @@
   {
     Body:
     [*
-      CapacityAndSaleBudgeChartElement::TestData( ScenarioManager );
+      //CapacityAndSaleBudgeChartElement::TestData( GlobalOTDTable );
       
-      ScenarioManager.CapacityAndSaleBudgeChart( DataHolderMacroPlansForScenarioComparison.Data(), 
-                                                 CheckboxIsCapacity.Checked(),
-                                                 DropDownTimeGroup.Text(),
-                                                 DropDownByBusinessTypeOrByOrgCode.Text(),
-                                                 DropDownBusinessTypes.Text(),
-                                                 DropDownPlaceOfProductionOfArrays.Text(),
-                                                 DropDownYears.Text(),
-                                                 MPSync, 
-                                                 GlobalOTDTable, 
-                                                 MacroPlan );
+      GlobalOTDTable.CapacityAndSaleBudgeChart( DataHolderMacroPlansForScenarioComparison.Data(), 
+                                                DropDownSaleOrCapacity.Text(),
+                                                DropDownTimeGroup.Text(),
+                                                DropDownByBusinessTypeOrByOrgCode.Text(),
+                                                DataHolderCapacityAndSaleBudgeFilterBusinessType.Data(),
+                                                DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray.Data(),
+                                                DataHolderCapacityAndSaleBudgeFilterYear.Data(),
+                                                DataHolderCapacityAndSaleBudgeFilterMonth.Data(),
+                                                GlobalOTDTable );
     *]
   }
 }

--
Gitblit v1.9.3