From ed09bf3eb41fcf1b79b083ac3d959f110b7e613b Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 14 十月 2024 18:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
index c61aeb4..d01722e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
@@ -10,11 +10,15 @@
Body:
[*
table := FinancialSalesSource::InitiateSearch( MacroPlan );
- //table := selectobject( MacroPlan, FinancialSalesSource.FinancialSalesReport, table, not table.IsImport() and table.IsShow() );
- //info( '------------------2----------------', table.IsImport(), table.IsShow() );
+ Factory::Initilize( MacroPlan );
+ ProductGeneration::Initilize( MacroPlan );
+ ProductPower::Initilize( MacroPlan );
+ ProductMLBMQB::Initilize( MacroPlan );
+ dhFactorys.Data( selectset( MacroPlan, Factory, factory, factory.ID() = FinancialProductionReport::GetDefaultAllUnit() ) );
+ dhGenerations.Data( selectset( MacroPlan, ProductGeneration, factory, true ) );
+ dhPowers.Data( selectset( MacroPlan, ProductPower, factory, true ) );
+ dhMQBMLBs.Data( selectset( MacroPlan, ProductMLBMQB, factory, true ) );
DataHolderTable.Data( table );
-
- //dhSearch.Data( MacroPlan.FinancialSalesSearch() );
*]
GroupServerCalls: false
}
--
Gitblit v1.9.3