From d4208b18ee7c6be4b5ebb26e5e942cb24d9f8bf4 Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期一, 25 九月 2023 22:38:49 +0800 Subject: [PATCH] Merge branch 'dev_cyy' into dev_realse_cyy --- _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def | 9 +++++---- 1 files changed, 5 insertions(+), 4 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..53e33ba 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def @@ -13,12 +13,13 @@ CapacityAndSaleBudgeChartElement::TestData( ScenarioManager ); ScenarioManager.CapacityAndSaleBudgeChart( DataHolderMacroPlansForScenarioComparison.Data(), - CheckboxIsCapacity.Checked(), + DropDownSaleOrCapacity.Text(), DropDownTimeGroup.Text(), DropDownByBusinessTypeOrByOrgCode.Text(), - DropDownBusinessTypes.Text(), - DropDownPlaceOfProductionOfArrays.Text(), - DropDownYears.Text(), + DataHolderCapacityAndSaleBudgeFilterBusinessType.Data(), + DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray.Data(), + DataHolderCapacityAndSaleBudgeFilterYear.Data(), + DataHolderCapacityAndSaleBudgeFilterMonth.Data(), MPSync, GlobalOTDTable, MacroPlan ); -- Gitblit v1.9.3