From 879b0d420555704579c76cf3234c61010539d6fc Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 07 十一月 2023 17:15:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_lrs
---
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 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..7b3ca1a 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
{
@@ -22,17 +16,16 @@
option := WebMessageBox::Question( "璇烽�夋嫨鏁版嵁婧�", "鏁版嵁婀東娴嬭瘯鏁版嵁|鍙栨秷" );
if ( option = 0 ) {
- WebMessageBox::Error( "鏁版嵁婀栨殏鏃犳暟鎹�", true );
+ WebMessageBox::Success( "寮�濮嬫媺鍙栦腑锛岃鏌ョ湅鎷夊彇鏃ュ織", true );
+ Global_MappingAnnualBudgetData::CreateData( GlobalOTDTable, ApplicationMacroPlanner.GetUserName() );
} else if ( option = 1 ) {
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