From d41977e710f5aefa9e7ec773ba68742794360c3e Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期日, 29 九月 2024 15:32:15 +0800
Subject: [PATCH] 报表进入页面查询初始化

---
 _Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl                         |   31 ++++++
 _Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitiateSearch.qbl                   |   27 +++++
 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def   |    7 -
 _Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_OnCreated.def     |    7 -
 _Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl                    |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_OnCreated.def |    7 -
 _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def        |    7 -
 _Main/BL/Type_EnginePipelineSource/StaticMethod_InitiateSearch.qbl                           |   26 +++++
 _Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_InitiateSearch.qbl                    |   27 +++++
 _Main/BL/Type_MachiningPipelineSource0/StaticMethod_InitiateSearch.qbl                       |   26 +++++
 _Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_OnCreated.def |    7 -
 _Main/BL/Type_FinancialProductionSource/StaticMethod_InitiateSearch.qbl                      |   28 +++++
 _Main/BL/Type_FinancialSalesSource/StaticMethod_InitiateSearch.qbl                           |   28 +++++
 _Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def      |    7 -
 _Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_OnCreated.def        |    7 -
 _Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl                           |    4 
 16 files changed, 213 insertions(+), 41 deletions(-)

diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..a6cdcd8
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,27 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as CCEngineLogisticsCostReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    allunit                   := DLEngineLogisticsCostReport::GetDefaultAllUnit();
+    search                    := owner.CCEngineLogisticsCostSearch();
+    if( isnull( search ) ){
+      owner.CCEngineLogisticsCostSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit );
+    }else{
+      search                  := owner.CCEngineLogisticsCostSearch();
+      search.Generation( allunit );
+      search.MqbMlb( allunit );
+      search.Power( allunit );
+    }
+    table := selectobject( owner, CCEngineLogisticsCostReport, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
index 82a7e9c..6c07839 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
@@ -14,8 +14,8 @@
     ccunit                    := DLEngineLogisticsCostReport::GetDefaultCCUnit();
     dlunit                    := DLEngineLogisticsCostReport::GetDefaultDLUnit();
     //dlline                    := DLEngineLogisticsCostReport::GetStockingPointDLLine();
-    ccrent                    := DLEngineLogisticsCostReport::GetStockingPointCCRent();
-    dlrent                    := DLEngineLogisticsCostReport::GetStockingPointCCRent();
+    //ccrent                    := DLEngineLogisticsCostReport::GetStockingPointCCRent();
+    //dlrent                    := DLEngineLogisticsCostReport::GetStockingPointCCRent();
     
     startofplanning           := owner.StartOfPlanning().Date();
     //startofyear               := startofplanning.StartOfYear();
@@ -31,8 +31,8 @@
     //澶栫搴撲粨鍌ㄨ垂鐢細浠撳偍鏁伴噺/鍖呰瀹归噺*浠撳偍鍗曚环锛屽湪Actual inventories閲屽彇鍒伴暱鏄ュ绉熷簱/澶ц繛澶栫搴撹鍙戝姩鏈虹殑浠撳偍閲忥紝鏍规嵁鍙戝姩鏈哄彿鎵惧埌瀵瑰簲鐨凣eneration 鍜屾í绾靛埗锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃閲屾壘鍒板搴旂殑浠撳偍鍗曚环鍜屽寘瑁呭閲忥紝鐢ㄥ叕寮忚绠楋紝鏈堝害杩涜姹囨��
     //闀挎槬澶栫搴撳叆搴�/鍑哄簱璐圭敤锛屽ぇ杩炲彂鍔ㄦ満鐨勯暱鏄ュ绉熷簱鐨凬ew supply
     traverse( owner, StockingPoint_MP, stockingpoint, stockingpoint.ID().EndsWith( '澶栫搴�' ) ){
-      unit                    := stockingpoint.Unit();
-      parentunits             := unit.GetAllParent();
+    //  unit                    := stockingpoint.Unit();
+    //  parentunits             := unit.GetAllParent();
       //鏄惁灞炰簬闀挎槬澶栫搴�
       isccrent                := stockingpoint.ID().StartsWith( '闀挎槬' ) or stockingpoint.ID().StartsWith( 'CC' );
       //鏄惁灞炰簬澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..997f6ba
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,27 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as DLEngineLogisticsCostReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    allunit                   := DLEngineLogisticsCostReport::GetDefaultAllUnit();
+    search                    := owner.DLEngineLogisticsCostSearch();
+    if( isnull( search ) ){
+      owner.DLEngineLogisticsCostSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit );
+    }else{
+      search                  := owner.DLEngineLogisticsCostSearch();
+      search.Generation( allunit );
+      search.MqbMlb( allunit );
+      search.Power( allunit );
+    }
+    table                     := selectobject( owner, DLEngineLogisticsCostReport, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/BL/Type_EnginePipelineSource/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_EnginePipelineSource/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..2c3837f
--- /dev/null
+++ b/_Main/BL/Type_EnginePipelineSource/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as EnginePipelineReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    search                    := owner.EnginePipelineSearch();
+    if( isnull( search ) ){
+      owner.EnginePipelineSearch( relnew, StartDate := Date::MinDate(), EndDate := Date::MaxDate(), TimeUnit := Translations::MP_GlobalParameters_Day() );
+    }else{
+      search                  := owner.EnginePipelineSearch();
+      search.TimeUnit( Translations::MP_GlobalParameters_Day() );
+      search.StartDate( Date::MinDate() );
+      search.EndDate( Date::MaxDate() );
+    }
+    table                     := selectobject( owner, EnginePipelineSource.Report, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/BL/Type_FinancialProductionSource/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_FinancialProductionSource/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..748afbf
--- /dev/null
+++ b/_Main/BL/Type_FinancialProductionSource/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,28 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as FinancialProductionReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    allunit                   := FinancialProductionReport::GetDefaultAllUnit();
+    search                    := owner.FinancialProductionSearch();
+    if( isnull( owner.FinancialProductionSearch() ) ){
+      owner.FinancialProductionSearch( relnew, Unit := allunit, Generation := allunit, MqbMlb := allunit, Power := allunit );
+    }else{
+      search                  := owner.FinancialProductionSearch();
+      search.Unit( allunit );
+      search.Generation( allunit );
+      search.MqbMlb( allunit );
+      search.Power( allunit );
+    }
+    table                     := selectobject( owner, FinancialProductionSource.FinancialProductionReport, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..eeff011
--- /dev/null
+++ b/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,28 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as FinancialSalesReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    allunit                   := FinancialSalesReport::GetDefaultAllUnit();
+    search                    := owner.FinancialSalesSearch();
+    if( isnull( search ) ){
+      owner.FinancialSalesSearch( relnew, Unit := allunit, Generation := allunit, MqbMlb := allunit, Power := allunit );
+    }else{
+      search                  := owner.FinancialSalesSearch();
+      search.Unit( allunit );
+      search.Generation( allunit );
+      search.MqbMlb( allunit );
+      search.Power( allunit );
+    }
+    table                     := selectobject( owner, FinancialSalesSource.FinancialSalesReport, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..4003115
--- /dev/null
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,31 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as InventorySummaryReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    allunit                   := InventorySummaryReport::GetDefaultAllUnit();
+    search                    := owner.InventorySummarySearch();
+    if( isnull( search ) ){
+      owner.InventorySummarySearch( relnew, Unit := allunit, Generation := allunit, MqbMlb := allunit, Power := allunit, Category := Translations::MP_GlobalParameters_Day(), StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+    }else{
+      search                  := owner.InventorySummarySearch();
+      search.Unit( allunit );
+      search.Generation( allunit );
+      search.MqbMlb( allunit );
+      search.Power( allunit );
+      search.Category( Translations::MP_GlobalParameters_Day() );
+      search.StartDate( Date::MinDate() );
+      search.EndDate( Date::MaxDate() );
+    }
+    table                     := selectobject( owner, InventorySummarySource.InventorySummaryReport, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
index 8d933a7..fefeec7 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
@@ -9,8 +9,8 @@
     // 鐢勫叞楦� Jun-24-2024 (created)
     owner.FinancialProductionSource( relflush );
     productparent             := MachiningPipelineReport::GetDefaultProductParent();
-    ccunit                    := MachiningPipelineReport::GetDefaultCCUnit();
-    dlunit                    := MachiningPipelineReport::GetDefaultDLUnit();
+    //ccunit                    := MachiningPipelineReport::GetDefaultCCUnit();
+    //dlunit                    := MachiningPipelineReport::GetDefaultDLUnit();
     //allunit                   := EnginePipelineReport::GetDefaultAllUnit();
     source                    := owner.MachiningPipelineSource( relnew, Name := MachiningPipelineReport::GetDefaultName() );
     table                     := source.Report( relnew, ID := source.Name(), Name := source.Name() );
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..2f69e1e
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+  MacroPlan owner
+) as MachiningPipelineReport
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Sep-29-2024 (created)
+    search                    := owner.MachiningPipelineSearch();
+    if( isnull( search ) ){
+      owner.MachiningPipelineSearch( relnew, StartDate := Date::MinDate(), EndDate := Date::MaxDate(), TimeUnit := Translations::MP_GlobalParameters_Day() );
+    }else{
+      search                  := owner.MachiningPipelineSearch();
+      search.TimeUnit( Translations::MP_GlobalParameters_Day() );
+      search.StartDate( Date::MinDate() );
+      search.EndDate( Date::MaxDate() );
+    }
+    table                     := selectobject( owner, MachiningPipelineSource.Report, table, table.IsShow() );
+    if( not isnull( table ) ){
+      products                := selectset( owner, Product_MP, product, true );
+      table.Generate( search, products );
+    }
+    return table;
+  *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_OnCreated.def
index 28c7923..7221c3c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_OnCreated.def
@@ -10,11 +10,8 @@
     Body:
     [*
       //鍒濆鍖�
-      //if( not exists( MacroPlan, FinancialProductionSource, source, not source.IsImport() ) ){
-      //  CCEngineLogisticsCostReport::Initialize( MacroPlan );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, CCEngineLogisticsCostReport, table, table.IsShow() );
+      table := CCEngineLogisticsCostReport::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, CCEngineLogisticsCostReport, table, table.IsShow() );
       //info( '------------------2----------------', table.IsImport(), table.IsShow() );
       DataHolderTable.Data( table );
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_OnCreated.def
index 7c84583..7802afc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_OnCreated.def
@@ -10,11 +10,8 @@
     Body:
     [*
       //鍒濆鍖�
-      //if( not exists( MacroPlan, FinancialProductionSource, source, not source.IsImport() ) ){
-      //  DLEngineLogisticsCostReport::InitializeNew(  MacroPlan );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, DLEngineLogisticsCostReport, table, table.IsShow() );
+      table := DLEngineLogisticsCostReport::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, DLEngineLogisticsCostReport, table, table.IsShow() );/
       //info( '------------------2----------------', table.IsImport(), table.IsShow() );
       DataHolderTable.Data( table );
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_OnCreated.def
index 13a96b8..ca04bd3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_OnCreated.def
@@ -9,11 +9,8 @@
   {
     Body:
     [*
-      //if( not isnull( MacroPlan.EnginePipelineSource() ) ){
-      //  EnginePipelineSource::Initialize( MacroPlan );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, EnginePipelineSource.Report, table, table.IsShow() );
+      table := EnginePipelineSource::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, EnginePipelineSource.Report, table, table.IsShow() );
       //info( '------------------2----------------', table.IsShow() );
       DataHolderTable.Data( table );
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
index 3f1f24c..3c15265 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
@@ -10,11 +10,8 @@
     Body:
     [*
       //鍒濆鍖�
-      //if( not exists( MacroPlan, FinancialProductionSource, source, not source.IsImport() ) ){
-      //  FinancialProductionSource::Initialize( MacroPlan );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, FinancialProductionSource.FinancialProductionReport, table, not table.IsImport() and table.IsShow() );
+      table := FinancialProductionSource::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, FinancialProductionSource.FinancialProductionReport, table, not table.IsImport() and table.IsShow() );
       //info( '------------------2----------------', table.IsImport(), table.IsShow() );
       DataHolderTable.Data( table );
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
index e4fa70a..c61aeb4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_OnCreated.def
@@ -9,11 +9,8 @@
   {
     Body:
     [*
-      //if( not exists( MacroPlan, FinancialSalesSource, source, not source.IsImport() ) ){
-      //  FinancialSalesSource::Initialize( MacroPlan );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, FinancialSalesSource.FinancialSalesReport, table, not table.IsImport() and table.IsShow() );
+      table := FinancialSalesSource::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, FinancialSalesSource.FinancialSalesReport, table, not table.IsImport() and table.IsShow() );
       //info( '------------------2----------------', table.IsImport(), table.IsShow() );
       DataHolderTable.Data( table );
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
index 9909444..379e9a6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
@@ -9,11 +9,8 @@
   {
     Body:
     [*
-      //if( not isnull( MacroPlan.InventorySummarySource() ) ){
-      //  InventorySummarySource::Initialize( MacroPlan, InterfaceDataset );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, InventorySummarySource.InventorySummaryReport, table, table.IsShow() );
+      table := InventorySummarySource::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, InventorySummarySource.InventorySummaryReport, table, table.IsShow() );
       //info( '------------------2----------------', table.IsShow() );
       DataHolderTable.Data( table );
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_OnCreated.def
index 716cc38..f9c1344 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_OnCreated.def
@@ -9,11 +9,8 @@
   {
     Body:
     [*
-      //if( not isnull( MacroPlan.EnginePipelineSource() ) ){
-      //  MachiningPipelineSource::Initialize( MacroPlan );
-      //}
-      //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, MachiningPipelineSource.Report, table, table.IsShow() );
+      table := MachiningPipelineSource::InitiateSearch( MacroPlan );
+      //table := selectobject( MacroPlan, MachiningPipelineSource.Report, table, table.IsShow() );
       //info( '------------------2----------------', table.IsShow() );
       DataHolderTable.Data( table );
       

--
Gitblit v1.9.3