From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001 From: yanweiyuan3 <yanweiyuan3@gmail.com> Date: 星期二, 10 十月 2023 17:45:58 +0800 Subject: [PATCH] Merge branch 'dev' into dev_yy --- _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def | 23 ++++++++++++----------- 1 files changed, 12 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..c481c62 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def @@ -10,18 +10,19 @@ { 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(), + MPSync, + GlobalOTDTable, + MacroPlan ); *] } } -- Gitblit v1.9.3