From d6bd7a69bc31efa79b21c7be12ba9547a921c251 Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期五, 03 十一月 2023 16:28:41 +0800 Subject: [PATCH] 年度产销预算BUG修改 --- _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def index 55bdd70..fa3f604 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def @@ -7,13 +7,7 @@ DefinitionID: 'Responsedef_WebButton_OnClick' Precondition: [* - flag := true; - - flag := GlobalOTDSOP.CapacityAndSaleBudgeFilterYear( relsize ) > 0 and - GlobalOTDSOP.CapacityAndSaleBudgeFilterBusinessType( relsize ) > 0 and - GlobalOTDSOP.CapacityAndSaleBudgeFilterPlaceOfProductionOfArray( relsize ) > 0; - - return flag; + return not isnull( GlobalOTDSOP ) and not isnull( GlobalOTDTable ); *] QuillAction { @@ -27,12 +21,10 @@ if ( DataHolderCheckedProduct.Data().Size() = 0 ) { WebMessageBox::Error( "璇峰厛鍦ㄥ乏渚у鑸爮閫夋嫨瑕佺敓鎴愭祴璇曟暟鎹殑浜у搧锛�", true ); } else { - GlobalOTDTable.InitTestDataByYear( MacroPlan, - GlobalOTDSOP, - DataHolderCapacityAndSaleBudgeFilterYear.Data(), - DataHolderCapacityAndSaleBudgeFilterBusinessType.Data(), - DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray.Data(), - DataHolderCheckedProduct.Data() ); + GlobalOTDTable.CreateCapacityAndSaleBudgeTestData( GlobalOTDSOP, + GlobalOTDTable, + DataHolderCapacityAndSaleBudgeFilterYear.Data(), + DataHolderCheckedProduct.Data() ); } } *] -- Gitblit v1.9.3