From 2c714b2284a68fbe764bbd11dd23e74d42d83f34 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 06 十一月 2024 14:44:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged#393.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListGeneration_273_OnCheckedChanged#384.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged#568.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListGeneration_OnCheckedChanged#670.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def | 6 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListPower_OnCheckedChanged#976.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged#925.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListMQBMLB_OnCheckedChanged#475.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListPower_480_OnCheckedChanged#568.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def | 6 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListMQBMLB_791_OnCheckedChanged#812.def | 5 +-
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def | 6 +-
12 files changed, 36 insertions(+), 27 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListGeneration_273_OnCheckedChanged\043384.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListGeneration_273_OnCheckedChanged\043384.def"
index c660207..78ae296 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListGeneration_273_OnCheckedChanged\043384.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListGeneration_273_OnCheckedChanged\043384.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductGeneration, generation, true );
- dhGenerations.Data( &selections );
+ //selections := selectset( MacroPlan, ProductGeneration, generation, true );
+ //dhGenerations.Data( &selections );
+ dhGenerations.Data().Flush();
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListMQBMLB_791_OnCheckedChanged\043812.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListMQBMLB_791_OnCheckedChanged\043812.def"
index ac75cf6..1715ab9 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListMQBMLB_791_OnCheckedChanged\043812.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListMQBMLB_791_OnCheckedChanged\043812.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
- dhMQBMLBs.Data( &selections );
+ //selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
+ //dhMQBMLBs.Data( &selections );
+ dhMQBMLBs.Data().Flush();
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListPower_480_OnCheckedChanged\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListPower_480_OnCheckedChanged\043568.def"
index 108f68f..4d9f37d 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListPower_480_OnCheckedChanged\043568.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_ListPower_480_OnCheckedChanged\043568.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductPower, generation, true );
- dhPowers.Data( &selections );
+ //selections := selectset( MacroPlan, ProductPower, generation, true );
+ //dhPowers.Data( &selections );
+ dhPowers.Data().Flush();
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
index 4ecacd9..db5a58c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
@@ -16,9 +16,9 @@
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 ) );
+ //dhGenerations.Data( selectset( MacroPlan, ProductGeneration, factory, true ) );
+ //dhPowers.Data( selectset( MacroPlan, ProductPower, factory, true ) );
+ //dhMQBMLBs.Data( selectset( MacroPlan, ProductMLBMQB, factory, true ) );
DataHolderTable.Data( table );
*]
GroupServerCalls: false
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListGeneration_OnCheckedChanged\043670.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListGeneration_OnCheckedChanged\043670.def"
index bd21d5e..fdebd8b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListGeneration_OnCheckedChanged\043670.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListGeneration_OnCheckedChanged\043670.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductGeneration, generation, true );
- dhGenerations.Data( &selections );
+ //selections := selectset( MacroPlan, ProductGeneration, generation, true );
+ //dhGenerations.Data( &selections );
+ dhGenerations.Data().Flush();
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListMQBMLB_OnCheckedChanged\043475.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListMQBMLB_OnCheckedChanged\043475.def"
index e95fe5d..cb259ab 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListMQBMLB_OnCheckedChanged\043475.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListMQBMLB_OnCheckedChanged\043475.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
- dhMQBMLBs.Data( &selections );
+ //selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
+ //dhMQBMLBs.Data( &selections );
+ dhMQBMLBs.Data().Flush();
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListPower_OnCheckedChanged\043976.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListPower_OnCheckedChanged\043976.def"
index c2db30a..f381189 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListPower_OnCheckedChanged\043976.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_ListPower_OnCheckedChanged\043976.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductPower, generation, true );
- dhPowers.Data( &selections );
+ //selections := selectset( MacroPlan, ProductPower, generation, true );
+ //dhPowers.Data( &selections );
+ dhPowers.Data().Flush();
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
index d01722e..6c8dc8d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
@@ -15,9 +15,9 @@
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 ) );
+ //dhGenerations.Data( selectset( MacroPlan, ProductGeneration, factory, true ) );
+ //dhPowers.Data( selectset( MacroPlan, ProductPower, factory, true ) );
+ //dhMQBMLBs.Data( selectset( MacroPlan, ProductMLBMQB, factory, true ) );
DataHolderTable.Data( table );
*]
GroupServerCalls: false
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def"
index 4571db5..7107cf4 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductGeneration, generation, true );
- dhGenerations.Data( &selections );
+ //selections := selectset( MacroPlan, ProductGeneration, generation, true );
+ //dhGenerations.Data( &selections );
+ dhGenerations.Data().Flush();
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def"
index ca3a785..b19f334 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
- dhMQBMLBs.Data( &selections );
+ //selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
+ //dhMQBMLBs.Data( &selections );
+ dhMQBMLBs.Data().Flush();
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def"
index cb08461..88791af 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def"
@@ -9,8 +9,9 @@
{
Body:
[*
- selections := selectset( MacroPlan, ProductPower, generation, true );
- dhPowers.Data( &selections );
+ //selections := selectset( MacroPlan, ProductPower, generation, true );
+ //dhPowers.Data( &selections );
+ dhPowers.Data().Flush();
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
index 0ac636d..b47c050 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
@@ -15,9 +15,9 @@
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 ) );
+ //dhGenerations.Data( selectset( MacroPlan, ProductGeneration, factory, true ) );
+ //dhPowers.Data( selectset( MacroPlan, ProductPower, factory, true ) );
+ //dhMQBMLBs.Data( selectset( MacroPlan, ProductMLBMQB, factory, true ) );
DataHolderTable.Data( table );
*]
GroupServerCalls: false
--
Gitblit v1.9.3