From 609d17f466b80466d7069871e54ec78542bcd991 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 17 十月 2023 17:20:50 +0800
Subject: [PATCH] 产能分配和面板拉料数据集迁移

---
 _Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDSOP_GlobalOTDSO.qbl                                                                   |   23 ++
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def                                                                         |    4 
 _Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDSOP_GlobalOTDSOP_PanelMaterialAll.qbl                                                                           |   23 ++
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def                          |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def                                            |    2 
 _Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDSOP_GlobalOTDSOP_CapacityAllocat.qbl                                                                   |   23 ++
 _Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def                                                                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def                                                                             |    2 
 _Main/BL/Type_PanelMaterialTM17/StaticMethod_ReceiveDataGeneration.qbl                                                                                                |   14 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def                                                                         |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def                                                          |    2 
 _Main/BL/Type_GlobalOTDSOP/StaticMethod_ReceivingPanelMaterials.qbl                                                                                                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def                                           |    4 
 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def                                          |   24 +-
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def                                                                 |    4 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def                                                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def                                                       |    4 
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl                                                                                                         |    8 
 _Main/BL/Type_PanelMaterialVehicle/StaticMethod_ReceiveDataGeneration.qbl                                                                                             |   14 
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_Test1.qbl                                                                                                        |    4 
 _Main/BL/IntegratorConfigs/IntegratorConfig_PanelMaterialRestServer/MessageEnhancerProcessor_MessageHeaderEnhancerProcessor.qbl                                       |    2 
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate1.qbl                                                                                                  |   40 ++--
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl                                                                                         |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def                                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def                                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnDataChanged.def                                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuGenerateByPeggin.def |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def                     |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def                                                      |    2 
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl                                                                                  |    4 
 _Main/BL/Type_GlobalOTDSOP/Method_SynchronizeOrders.qbl                                                                                                               |    0 
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR#39.def                  |    2 
 _Main/BL/Type_GlobalOTDSOP/Method_ReceivingPanelMaterials.qbl                                                                                                         |    0 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def                                                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def                                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def                                     |    4 
 _Main/BL/Type_PanelMaterialAutomotiveElectronics/StaticMethod_ReceiveDataGeneration.qbl                                                                               |   14 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnCreated.def                                                  |    2 
 _Main/BL/Type_PanelMaterialTianHua/StaticMethod_ReceiveDataGeneration.qbl                                                                                             |   14 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def                                                         |    2 
 _Main/BL/Type_PanelMaterialSpecializedDisplay/StaticMethod_ReceiveDataGeneration.qbl                                                                                  |   14 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def                                                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def                                                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def                                                            |    2 
 _Main/BL/Type_PanelMaterialTM18/StaticMethod_ReceiveDataGeneration.qbl                                                                                                |   14 
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl                                                                                         |   46 ++--
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl                                                                                                   |   12 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def                                                                 |    2 
 _Main/BL/Type_PanelMaterialIT/StaticMethod_ReceiveDataGeneration.qbl                                                                                                  |   14 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def                                    |    2 
 _Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl                                                                                          |   26 +-
 _Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl                                               |    2 
 _Main/BL/Type_PanelMaterialSportsHealth/StaticMethod_ReceiveDataGeneration.qbl                                                                                        |   14 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def                                                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def                                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def                                                                          |    2 
 /dev/null                                                                                                                                                             |   23 --
 _Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def                                                                                        |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def                                                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def                                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def                                                                 |    4 
 63 files changed, 262 insertions(+), 216 deletions(-)

diff --git a/_Main/BL/IntegratorConfigs/IntegratorConfig_PanelMaterialRestServer/MessageEnhancerProcessor_MessageHeaderEnhancerProcessor.qbl b/_Main/BL/IntegratorConfigs/IntegratorConfig_PanelMaterialRestServer/MessageEnhancerProcessor_MessageHeaderEnhancerProcessor.qbl
index 28845d0..5e2eb3e 100644
--- a/_Main/BL/IntegratorConfigs/IntegratorConfig_PanelMaterialRestServer/MessageEnhancerProcessor_MessageHeaderEnhancerProcessor.qbl
+++ b/_Main/BL/IntegratorConfigs/IntegratorConfig_PanelMaterialRestServer/MessageEnhancerProcessor_MessageHeaderEnhancerProcessor.qbl
@@ -20,6 +20,6 @@
   {
     Property: '_QI.Type'
     Type: 'String'
-    Value: 'GlobalOTDTable'
+    Value: 'GlobalOTDSOP'
   }
 }
diff --git a/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDSOP_GlobalOTDSO.qbl b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDSOP_GlobalOTDSO.qbl
new file mode 100644
index 0000000..73f12a2
--- /dev/null
+++ b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDSOP_GlobalOTDSO.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation CapacityAllocationResultsRuleConfiguration_GlobalOTDSOP_GlobalOTDSOP_CapacityAllocationResultsRuleConfiguration
+{
+  #keys: '1[414702.1.138430337]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide GlobalOTDSOP
+  {
+    #keys: '3[414702.1.138430339][414702.1.138430338][414702.1.138430340]'
+    Cardinality: '0to1'
+    ObjectDefinition: CapacityAllocationResultsRuleConfiguration
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide CapacityAllocationResultsRuleConfiguration
+  {
+    #keys: '3[414702.1.138430342][414702.1.138430341][414702.1.138430343]'
+    Cardinality: '1toN'
+    ObjectDefinition: GlobalOTDSOP
+    OwningSide: 'Owned'
+  }
+}
diff --git a/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl
deleted file mode 100644
index 40be5f9..0000000
--- a/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTDTable_CapacityAllocationResultsRuleConfiguration
-{
-  #keys: '1[414702.0.374991408]'
-  DefaultRelationStrategy
-  {
-  }
-  RelationSide.LeftSide GlobalOTDTable
-  {
-    #keys: '3[414702.0.374991410][414702.0.374991409][414702.0.374991411]'
-    Cardinality: '0to1'
-    ObjectDefinition: CapacityAllocationResultsRuleConfiguration
-    OwningSide: 'Reference'
-  }
-  RelationSide.RightSide CapacityAllocationResultsRuleConfiguration
-  {
-    #keys: '3[414702.0.374991413][414702.0.374991412][414702.0.374991414]'
-    Cardinality: '1toN'
-    ObjectDefinition: GlobalOTDTable
-    OwningSide: 'Owned'
-  }
-}
diff --git a/_Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDSOP_GlobalOTDSOP_CapacityAllocat.qbl b/_Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDSOP_GlobalOTDSOP_CapacityAllocat.qbl
new file mode 100644
index 0000000..476e161
--- /dev/null
+++ b/_Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDSOP_GlobalOTDSOP_CapacityAllocat.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation CapacityAllocationResults_GlobalOTDSOP_GlobalOTDSOP_CapacityAllocationResults
+{
+  #keys: '1[414702.1.138430321]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide GlobalOTDSOP
+  {
+    #keys: '3[414702.1.138430323][414702.1.138430322][414702.1.138430324]'
+    Cardinality: '0to1'
+    ObjectDefinition: CapacityAllocationResults
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide CapacityAllocationResults
+  {
+    #keys: '3[414702.1.138430326][414702.1.138430325][414702.1.138430327]'
+    Cardinality: '1toN'
+    ObjectDefinition: GlobalOTDSOP
+    OwningSide: 'Owned'
+  }
+}
diff --git a/_Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDTable_GlobalOTDTable_CapacityAll.qbl b/_Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDTable_GlobalOTDTable_CapacityAll.qbl
deleted file mode 100644
index 278c0e9..0000000
--- a/_Main/BL/Relations/Relation_CapacityAllocationResults_GlobalOTDTable_GlobalOTDTable_CapacityAll.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation CapacityAllocationResults_GlobalOTDTable_GlobalOTDTable_CapacityAllocationResults
-{
-  #keys: '1[414702.0.340560333]'
-  DefaultRelationStrategy
-  {
-  }
-  RelationSide.LeftSide GlobalOTDTable
-  {
-    #keys: '3[414702.0.340560335][414702.0.340560334][414702.0.340560336]'
-    Cardinality: '0to1'
-    ObjectDefinition: CapacityAllocationResults
-    OwningSide: 'Reference'
-  }
-  RelationSide.RightSide CapacityAllocationResults
-  {
-    #keys: '3[414702.0.340560338][414702.0.340560337][414702.0.340560339]'
-    Cardinality: '1toN'
-    ObjectDefinition: GlobalOTDTable
-    OwningSide: 'Owned'
-  }
-}
diff --git a/_Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDSOP_GlobalOTDSOP_PanelMaterialAll.qbl b/_Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDSOP_GlobalOTDSOP_PanelMaterialAll.qbl
new file mode 100644
index 0000000..9da7ad0
--- /dev/null
+++ b/_Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDSOP_GlobalOTDSOP_PanelMaterialAll.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation PanelMaterialAll_GlobalOTDSOP_GlobalOTDSOP_PanelMaterialAll
+{
+  #keys: '1[414702.1.138384587]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide GlobalOTDSOP
+  {
+    #keys: '3[414702.1.138384589][414702.1.138384588][414702.1.138384590]'
+    Cardinality: '0to1'
+    ObjectDefinition: PanelMaterialAll
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide PanelMaterialAll
+  {
+    #keys: '3[414702.1.138384592][414702.1.138384591][414702.1.138384593]'
+    Cardinality: '1toN'
+    ObjectDefinition: GlobalOTDSOP
+    OwningSide: 'Owned'
+  }
+}
diff --git a/_Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDTable_GlobalOTDTable_PanelMaterialAll.qbl b/_Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDTable_GlobalOTDTable_PanelMaterialAll.qbl
deleted file mode 100644
index f2cc83e..0000000
--- a/_Main/BL/Relations/Relation_PanelMaterialAll_GlobalOTDTable_GlobalOTDTable_PanelMaterialAll.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation PanelMaterialAll_GlobalOTDTable_GlobalOTDTable_PanelMaterialAll
-{
-  #keys: '1[414702.0.196798981]'
-  DefaultRelationStrategy
-  {
-  }
-  RelationSide.LeftSide GlobalOTDTable
-  {
-    #keys: '3[414702.0.196798983][414702.0.196798982][414702.0.196798984]'
-    Cardinality: '0to1'
-    ObjectDefinition: PanelMaterialAll
-    OwningSide: 'Reference'
-  }
-  RelationSide.RightSide PanelMaterialAll
-  {
-    #keys: '3[414702.0.196798986][414702.0.196798985][414702.0.196798987]'
-    Cardinality: '1toN'
-    ObjectDefinition: GlobalOTDTable
-    OwningSide: 'Owned'
-  }
-}
diff --git a/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl b/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl
index 59c9af0..86a37a9 100644
--- a/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl
@@ -5,7 +5,7 @@
   #keys: '1[414702.0.388304510]'
   Expression:
   [*
-    targetCapacityAllocationResultsRuleConfiguration := select( this.GlobalOTDTable(), CapacityAllocationResultsRuleConfiguration, tempCARRC, 
+    targetCapacityAllocationResultsRuleConfiguration := select( this.GlobalOTDSOP(), CapacityAllocationResultsRuleConfiguration, tempCARRC, 
                                                                 tempCARRC.ModuleMaterialCode() = this.ModuleMaterialCode() and
                                                                 tempCARRC.PanelMaterialCode() = this.PanelMaterialCode() );
     
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl
index 2340157..0f65a44 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl
@@ -1,16 +1,16 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod CreateDate (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   MacroPlan macroPlan,
   Scenario scenario
 )
 {
   TextBody:
   [*
-    globalOTDTable.CapacityAllocationResults( relflush );
+    globalOTDSOP.CapacityAllocationResults( relflush );
     
-    finaleProductInStockingPoint_MPs := CapacityAllocationResults::ObtainTheFinalOutputProduct( macroPlan, globalOTDTable );
+    finaleProductInStockingPoint_MPs := CapacityAllocationResults::ObtainTheFinalOutputProduct( macroPlan, globalOTDSOP );
     
     period_MPS := null( Period_MPs );
     traverse ( macroPlan, PeriodSpecification_MP, psmp, psmp.ID() = "Planning periods" ) {
@@ -18,15 +18,15 @@
     }
     
     traverse ( finaleProductInStockingPoint_MPs, Elements, fpispmp ) {
-      capacityAllocationResultsRuleConfigurations := selectset( globalOTDTable, CapacityAllocationResultsRuleConfiguration, tempCARRC, tempCARRC.ModuleMaterialCode() = fpispmp.ProductID() and tempCARRC.StockingPointID() = fpispmp.StockingPointID() );
+      capacityAllocationResultsRuleConfigurations := selectset( globalOTDSOP, CapacityAllocationResultsRuleConfiguration, tempCARRC, tempCARRC.ModuleMaterialCode() = fpispmp.ProductID() and tempCARRC.StockingPointID() = fpispmp.StockingPointID() );
     //  info( "鐢熶骇鐨勪骇鍝侊細", fpispmp.ProductID(), "------浜у搧鍦ㄥ簱瀛樼偣-------锛�", fpispmp.StockingPointID() );
       traverse ( period_MPS, Elements, pmp ) {     
         // CapacityAllocationResults::IterativeGeneration( globalOTDTable, pisp, 1, null( NewSupply ), -1.0, pmp.StartDate() ); 鑰佺増
-        CapacityAllocationResults::IterativeGeneration2( globalOTDTable, fpispmp, pmp.StartDate(), capacityAllocationResultsRuleConfigurations, 0, null( NewSupply ), 0.0 );
+        CapacityAllocationResults::IterativeGeneration2( globalOTDSOP, fpispmp, pmp.StartDate(), capacityAllocationResultsRuleConfigurations, 0, null( NewSupply ), 0.0 );
       }
     }
     
-    traverse ( globalOTDTable, CapacityAllocationResults, car ) {
+    traverse ( globalOTDSOP, CapacityAllocationResults, car ) {
       car.VersionNumber( scenario.Name() );
     }
   *]
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate1.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate1.qbl
index 2b6d0a6..867dabd 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate1.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate1.qbl
@@ -2,7 +2,7 @@
 #parent: #root
 StaticMethod CreateDate1 (
   MacroPlan macroPlan,
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   DependentDemand dependentDemand,
   NewSupply newSupply,
   Supply_MP firstNewSupply,
@@ -18,25 +18,25 @@
     
     if ( capacityAllocationResultsRuleConfiguration.PanelMaterialCode() = productID ) {
       info( "鎵惧埌浜嗭紒锛侊紒" );
-      globalOTDTable.CapacityAllocationResults( relnew,
-                                                PanelBase             := panelPISP.StockingPointID(),
-                                                PanelMaterialCode     := panelPISP.ProductID(),
-                                                NumberOfPanels        := fulfillmentQuantity,
-                                                PanelMeasurementUnit  := panelPISP.UnitOfMeasure_MP().Name(),
-                                                ModuleMaterialCode    := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().ProductID(),
-                                                NumberOfModules       := firstNewSupply.Quantity(),
-                                                ModuleMeasurementUnit := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().UnitOfMeasureName(),
-                                                ModuleBase            := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().StockingPointID(),
-                                                RequirementDate       := dependentDemand.Start().Date(),
-                                                // 瀵煎嚭澶栭儴渚涘簲瀛楁
-                                                Date                  := dependentDemand.Start().Date(),
-                                                Description           := "",
-                                                ID                    := OS::GenerateGUIDAsString(),
-                                                ProductID             := panelPISP.ProductID(),
-                                                StockingPointID       := panelPISP.StockingPointID(),
-                                                UserQuantity          := fulfillmentQuantity,
-                                                ManufacturedDate      := Date::MinDate()
-                                               );
+      globalOTDSOP.CapacityAllocationResults( relnew,
+                                              PanelBase             := panelPISP.StockingPointID(),
+                                              PanelMaterialCode     := panelPISP.ProductID(),
+                                              NumberOfPanels        := fulfillmentQuantity,
+                                              PanelMeasurementUnit  := panelPISP.UnitOfMeasure_MP().Name(),
+                                              ModuleMaterialCode    := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().ProductID(),
+                                              NumberOfModules       := firstNewSupply.Quantity(),
+                                              ModuleMeasurementUnit := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().UnitOfMeasureName(),
+                                              ModuleBase            := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().StockingPointID(),
+                                              RequirementDate       := dependentDemand.Start().Date(),
+                                              // 瀵煎嚭澶栭儴渚涘簲瀛楁
+                                              Date                  := dependentDemand.Start().Date(),
+                                              Description           := "",
+                                              ID                    := OS::GenerateGUIDAsString(),
+                                              ProductID             := panelPISP.ProductID(),
+                                              StockingPointID       := panelPISP.StockingPointID(),
+                                              UserQuantity          := fulfillmentQuantity,
+                                              ManufacturedDate      := Date::MinDate()
+                                             );
     }
   *]
 }
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl
index af2857c..92e3c7f 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod IterativeGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   ProductInStockingPoint_MP pisp,
   Number numberOfLayers,
   NewSupply finaleNewSupply,
@@ -27,7 +27,7 @@
             oi := dd.ProcessInput().astype( OperationInput );
             finaleDependentDemand := finaleDependentDemand * oo.Quantity() * oi.Quantity();
     //        info( "渚濊禆闇�姹備骇鍝両D锛�", dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(), "    渚濊禆鏁伴噺锛�", dd.Quantity(), "    褰撳墠鍛ㄦ湡浠诲姟Key锛�", dd.PeriodTask_MP().astype( PeriodTaskOperation ).Key() );
-            CapacityAllocationResults::IterativeGeneration( globalOTDTable, dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(), numberOfLayers, finaleNewSupply, finaleDependentDemand, targetDate );
+            CapacityAllocationResults::IterativeGeneration( globalOTDSOP, dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(), numberOfLayers, finaleNewSupply, finaleDependentDemand, targetDate );
           }
     //      info( "----------------------------------------------------" );
         } else {
@@ -35,17 +35,17 @@
     //      info( "======" );
           pispPanel := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP();
           pispModule := finaleNewSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP();
-          globalOTDTable.CapacityAllocationResults( relnew,
-                                                    PanelBase             := pispPanel.StockingPointID(),
-                                                    PanelMaterialCode     := pispPanel.ProductID(),
-                                                    NumberOfPanels        := finaleDependentDemand,
-                                                    PanelMeasurementUnit  := pispPanel.UnitOfMeasure_MP().Name(),
-                                                    ModuleMaterialCode    := pispModule.ProductID(),
-                                                    NumberOfModules       := finaleNewSupply.Quantity(),
-                                                    ModuleMeasurementUnit := pispModule.UnitOfMeasure_MP().Name(),
-                                                    ModuleBase            := pispModule.StockingPointID(),
-                                                    RequirementDate       := finaleNewSupply.Start().Date()
-                                                   );
+          globalOTDSOP.CapacityAllocationResults( relnew,
+                                                  PanelBase             := pispPanel.StockingPointID(),
+                                                  PanelMaterialCode     := pispPanel.ProductID(),
+                                                  NumberOfPanels        := finaleDependentDemand,
+                                                  PanelMeasurementUnit  := pispPanel.UnitOfMeasure_MP().Name(),
+                                                  ModuleMaterialCode    := pispModule.ProductID(),
+                                                  NumberOfModules       := finaleNewSupply.Quantity(),
+                                                  ModuleMeasurementUnit := pispModule.UnitOfMeasure_MP().Name(),
+                                                  ModuleBase            := pispModule.StockingPointID(),
+                                                  RequirementDate       := finaleNewSupply.Start().Date()
+                                                 );
         }
         finaleNewSupply := null( NewSupply );
       }
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl
index 226f832..36a59af 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod IterativeGeneration2 (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   ProductInStockingPoint_MP pisp,
   Date targetDate,
   CapacityAllocationResultsRuleConfigurations carrcs,
@@ -21,7 +21,7 @@
         previous := pispippl.PreviousPlanningPISPIP().astype( ProductInStockingPointInPeriodPlanningLeaf );
         if ( not previous.Period_MP().IsHistorical() ) {
           previousDate := previous.Start().Date();
-          CapacityAllocationResults::IterativeGeneration2( globalOTDTable,
+          CapacityAllocationResults::IterativeGeneration2( globalOTDSOP,
                                                            pisp,
                                                            previousDate,
                                                            carrcs,
@@ -50,7 +50,7 @@
     //          info( "灞傛暟锛�", numberOfLayers, "    褰撳墠渚涘簲鐨刾isp锛�", ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), "    鎬讳緵搴斿�硷細", ns.Quantity(), "    闇�瑕佷緵搴斿�硷細", currentLayerDependentDemandQuantity,
     //                "    褰撳墠闇�姹俻isp锛�", dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), "    闇�姹傚�硷細", currentLayerDependentDemandQuantity );
     //          info( "-----------------------------------------------------------------------------------------------------------------" );
-              CapacityAllocationResults::IterativeGeneration2( globalOTDTable,
+              CapacityAllocationResults::IterativeGeneration2( globalOTDSOP,
                                                                dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(),
                                                                targetDate,
                                                                carrcs,
@@ -62,25 +62,25 @@
             carrc := select( carrcs, Elements, carrc, carrc.PanelMaterialCode() = ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID() );
             if ( not isnull( carrc ) ) {
     //          info( "鎵惧埌闈㈡澘鐗╂枡..." );
-              globalOTDTable.CapacityAllocationResults( relnew,
-                                                        PanelBase             := pto.Operation().UnitID(),
-                                                        PanelMaterialCode     := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(),
-                                                        NumberOfPanels        := currentLayerDependentDemandQuantity,
-                                                        PanelMeasurementUnit  := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().UnitOfMeasureName(),
-                                                        ModuleMaterialCode    := firstLevelSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(),
-                                                        NumberOfModules       := firstLevelSupply.Quantity(),
-                                                        ModuleMeasurementUnit := firstLevelSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().UnitOfMeasureName(),
-                                                        ModuleBase            := guard( firstLevelSupply.PeriodTask_MP().astype( PeriodTaskOperation ).Operation().UnitID(), "杞﹂亾杩愯緭" ),
-                                                        Division              := carrc.Division(),
-                                                        RequirementDate       := firstLevelSupply.Start().Date(),
-                                                        Date                  := firstLevelSupply.Start().Date(),
-                                                        Description           := "",
-                                                        ID                    := OS::GenerateGUIDAsString(),
-                                                        ProductID             := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(),
-                                                        StockingPointID       := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().StockingPointID(),
-                                                        UserQuantity          := currentLayerDependentDemandQuantity,
-                                                        ManufacturedDate      := Date::MinDate()
-                                                       );
+              globalOTDSOP.CapacityAllocationResults( relnew,
+                                                      PanelBase             := pto.Operation().UnitID(),
+                                                      PanelMaterialCode     := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(),
+                                                      NumberOfPanels        := currentLayerDependentDemandQuantity,
+                                                      PanelMeasurementUnit  := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().UnitOfMeasureName(),
+                                                      ModuleMaterialCode    := firstLevelSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(),
+                                                      NumberOfModules       := firstLevelSupply.Quantity(),
+                                                      ModuleMeasurementUnit := firstLevelSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().UnitOfMeasureName(),
+                                                      ModuleBase            := guard( firstLevelSupply.PeriodTask_MP().astype( PeriodTaskOperation ).Operation().UnitID(), "杞﹂亾杩愯緭" ),
+                                                      Division              := carrc.Division(),
+                                                      RequirementDate       := firstLevelSupply.Start().Date(),
+                                                      Date                  := firstLevelSupply.Start().Date(),
+                                                      Description           := "",
+                                                      ID                    := OS::GenerateGUIDAsString(),
+                                                      ProductID             := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(),
+                                                      StockingPointID       := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().StockingPointID(),
+                                                      UserQuantity          := currentLayerDependentDemandQuantity,
+                                                      ManufacturedDate      := Date::MinDate()
+                                                     );
                                                         
             }
             //info( "-----------------------------------------------------------------------------------------------------------------" );
@@ -93,7 +93,7 @@
     //              "    褰撳墠闇�姹俻isp锛�", targetDependentDemand.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), "    闇�姹傚�硷細", currentLayerDependentDemandQuantity );
     //        info( "LaneLeg鍛ㄦ湡浠诲姟..." );
             //info( "-----------------------------------------------------------------------------------------------------------------" );
-            CapacityAllocationResults::IterativeGeneration2( globalOTDTable,
+            CapacityAllocationResults::IterativeGeneration2( globalOTDSOP,
                                                              targetDependentDemand.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(),
                                                              targetDate,
                                                              carrcs,
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl
index 1c16b4d..a10d437 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl
@@ -2,7 +2,7 @@
 #parent: #root
 StaticMethod IterativeGeneration3 (
   MacroPlan macroPlan,
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   Supply_MP smp,
   Supply_MP firstSMP,
   Number numberOfPlies,
@@ -27,9 +27,9 @@
                 fulfillmentQuantity := ( dd.Quantity() / ns.Quantity() ) * fulfillmentQuantity;
                 info( "--------------------------------------------------------------" );
                 if ( not isnull( capacityAllocationResultsRuleConfiguration ) ) {
-                  CapacityAllocationResults::CreateDate1( macroPlan, globalOTDTable, dd, ns, firstSMP, capacityAllocationResultsRuleConfiguration, fulfillmentQuantity );
+                  CapacityAllocationResults::CreateDate1( macroPlan, globalOTDSOP, dd, ns, firstSMP, capacityAllocationResultsRuleConfiguration, fulfillmentQuantity );
                 }
-                CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDTable, smp1, firstSMP, numberOfPlies, fulfillmentQuantity, capacityAllocationResultsRuleConfiguration );
+                CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDSOP, smp1, firstSMP, numberOfPlies, fulfillmentQuantity, capacityAllocationResultsRuleConfiguration );
                 numberOfPlies--;
               }
             }
@@ -45,9 +45,9 @@
               numberOfPlies++;
               info( "--------------------------------------------------------------" );
               if ( not isnull( capacityAllocationResultsRuleConfiguration ) ) {
-                CapacityAllocationResults::CreateDate1( macroPlan, globalOTDTable, targetDependentDemand, ns, firstSMP, capacityAllocationResultsRuleConfiguration, f.Quantity() );
+                CapacityAllocationResults::CreateDate1( macroPlan, globalOTDSOP, targetDependentDemand, ns, firstSMP, capacityAllocationResultsRuleConfiguration, f.Quantity() );
               }
-              CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDTable, smp1, firstSMP, numberOfPlies, f.Quantity(), capacityAllocationResultsRuleConfiguration );
+              CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDSOP, smp1, firstSMP, numberOfPlies, f.Quantity(), capacityAllocationResultsRuleConfiguration );
               numberOfPlies--;
             }
           }
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl
index 6501563..f0f089a 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl
@@ -2,7 +2,7 @@
 #parent: #root
 StaticMethod ObtainTheFinalOutputProduct (
   MacroPlan macroPlan,
-  GlobalOTDTable globalOTDTable
+  GlobalOTDSOP globalOTDSOP
 ) as owning ProductInStockingPoint_MPs
 {
   TextBody:
@@ -22,7 +22,7 @@
     //}
     
     finaleProductInStockingPoint_MPs := selectset( macroPlan, Product_MP.ProductInStockingPoint_MP, tempPISPMP, 
-                                                   exists( globalOTDTable, CapacityAllocationResultsRuleConfiguration, tempCARRC, tempCARRC.ModuleMaterialCode() = tempPISPMP.ProductID() and tempCARRC.StockingPointID() = tempPISPMP.StockingPointID() )
+                                                   exists( globalOTDSOP, CapacityAllocationResultsRuleConfiguration, tempCARRC, tempCARRC.ModuleMaterialCode() = tempPISPMP.ProductID() and tempCARRC.StockingPointID() = tempPISPMP.StockingPointID() )
                                                   );
     
     return &finaleProductInStockingPoint_MPs;
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl
index 416ea24..bc20514 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl
@@ -2,14 +2,14 @@
 #parent: #root
 StaticMethod Test (
   MacroPlan macroPlan,
-  GlobalOTDTable globalOTDTable
+  GlobalOTDSOP globalOTDSOP
 )
 {
   TextBody:
   [*
-    globalOTDTable.CapacityAllocationResults( relflush );
+    globalOTDSOP.CapacityAllocationResults( relflush );
     
-    capacityAllocationResultsRuleConfiguration := select( globalOTDTable, CapacityAllocationResultsRuleConfiguration, carrc, 
+    capacityAllocationResultsRuleConfiguration := select( globalOTDSOP, CapacityAllocationResultsRuleConfiguration, carrc, 
                                                           carrc.ModuleMaterialCode() = "ProXOver 1 D2.6 A" and
                                                           carrc.StockingPointID() = "Carco Philadelphia" );
     
@@ -18,7 +18,7 @@
       traverse ( pisp, ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ).Supply_MP, smp, 
                  /*smp.ProductInStockingPointInPeriodPlanning().Start().Date() = Date::Construct( 2020, 4, 7 ) and*/
                  smp.Quantity() > 0 ) {                                                                  
-        CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDTable, smp, smp, 1, smp.Quantity(), capacityAllocationResultsRuleConfiguration );
+        CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDSOP, smp, smp, 1, smp.Quantity(), capacityAllocationResultsRuleConfiguration );
       }
     }
   *]
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test1.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test1.qbl
index a56cf1b..e12a971 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test1.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test1.qbl
@@ -2,7 +2,7 @@
 #parent: #root
 StaticMethod Test1 (
   MacroPlan macroPlan,
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   CapacityAllocationResultsRuleConfigurations capacityAllocationResultsRuleConfigurations
 )
 {
@@ -14,7 +14,7 @@
       traverse ( pisp, ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ).Supply_MP, smp, 
                  /*smp.ProductInStockingPointInPeriodPlanning().Start().Date() = Date::Construct( 2020, 4, 7 ) and*/
                  smp.Quantity() > 0 ) {                                                                  
-        CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDTable, smp, smp, 1, smp.Quantity(), carrc );
+        CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDSOP, smp, smp, 1, smp.Quantity(), carrc );
         info( "=======================================================>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" );
       }
     }
diff --git a/_Main/BL/Type_GlobalDTOTable/Method_ReceivingPanelMaterials.qbl b/_Main/BL/Type_GlobalOTDSOP/Method_ReceivingPanelMaterials.qbl
similarity index 100%
rename from _Main/BL/Type_GlobalDTOTable/Method_ReceivingPanelMaterials.qbl
rename to _Main/BL/Type_GlobalOTDSOP/Method_ReceivingPanelMaterials.qbl
diff --git a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeOrders.qbl b/_Main/BL/Type_GlobalOTDSOP/Method_SynchronizeOrders.qbl
similarity index 100%
rename from _Main/BL/Type_GlobalDTOTable/Method_SynchronizeOrders.qbl
rename to _Main/BL/Type_GlobalOTDSOP/Method_SynchronizeOrders.qbl
diff --git a/_Main/BL/Type_GlobalDTOTable/StaticMethod_ReceivingPanelMaterials.qbl b/_Main/BL/Type_GlobalOTDSOP/StaticMethod_ReceivingPanelMaterials.qbl
similarity index 62%
rename from _Main/BL/Type_GlobalDTOTable/StaticMethod_ReceivingPanelMaterials.qbl
rename to _Main/BL/Type_GlobalOTDSOP/StaticMethod_ReceivingPanelMaterials.qbl
index ad3eacc..31a3c66 100644
--- a/_Main/BL/Type_GlobalDTOTable/StaticMethod_ReceivingPanelMaterials.qbl
+++ b/_Main/BL/Type_GlobalOTDSOP/StaticMethod_ReceivingPanelMaterials.qbl
@@ -2,11 +2,11 @@
 #parent: #root
 StaticMethod ReceivingPanelMaterials (
   NamedValueTree requestnvt
-) as stream[NamedValueTree]
+)
 {
   TextBody:
   [*
-    MDSGlobalOTDTable::Find( DatasetFindOptions::Construct("GlobalOTDTable")) -> ( c ) {
+    MDSGlobalOTDSOP::Find( DatasetFindOptions::Construct("GlobalOTDSOP")) -> ( c ) {
       return c.ReceivingPanelMaterials( requestnvt );
     }
   *]
diff --git a/_Main/BL/Type_PanelMaterialAutomotiveElectronics/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialAutomotiveElectronics/StaticMethod_ReceiveDataGeneration.qbl
index 7e23ced..3e40288 100644
--- a/_Main/BL/Type_PanelMaterialAutomotiveElectronics/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialAutomotiveElectronics/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialIT/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialIT/StaticMethod_ReceiveDataGeneration.qbl
index 2247ccb..39590fa 100644
--- a/_Main/BL/Type_PanelMaterialIT/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialIT/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialSpecializedDisplay/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialSpecializedDisplay/StaticMethod_ReceiveDataGeneration.qbl
index 699665f..da488c1 100644
--- a/_Main/BL/Type_PanelMaterialSpecializedDisplay/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialSpecializedDisplay/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialSportsHealth/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialSportsHealth/StaticMethod_ReceiveDataGeneration.qbl
index 21dd372..ae91512 100644
--- a/_Main/BL/Type_PanelMaterialSportsHealth/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialSportsHealth/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialTM17/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialTM17/StaticMethod_ReceiveDataGeneration.qbl
index e3cd600..c07b02c 100644
--- a/_Main/BL/Type_PanelMaterialTM17/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialTM17/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialTM18/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialTM18/StaticMethod_ReceiveDataGeneration.qbl
index 81c7bd9..c646fb6 100644
--- a/_Main/BL/Type_PanelMaterialTM18/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialTM18/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialTianHua/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialTianHua/StaticMethod_ReceiveDataGeneration.qbl
index a21141a..7d2964a 100644
--- a/_Main/BL/Type_PanelMaterialTianHua/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialTianHua/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/BL/Type_PanelMaterialVehicle/StaticMethod_ReceiveDataGeneration.qbl b/_Main/BL/Type_PanelMaterialVehicle/StaticMethod_ReceiveDataGeneration.qbl
index 6160180..668e4f6 100644
--- a/_Main/BL/Type_PanelMaterialVehicle/StaticMethod_ReceiveDataGeneration.qbl
+++ b/_Main/BL/Type_PanelMaterialVehicle/StaticMethod_ReceiveDataGeneration.qbl
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod ReceiveDataGeneration (
-  GlobalOTDTable globalOTDTable,
+  GlobalOTDSOP globalOTDSOP,
   NamedValueTree requestnvt
 )
 {
@@ -25,15 +25,15 @@
     businessTypeNameValue := restPayloadNameValue.Child( businessTypeHandle );
     scenarioNameNameValue := restPayloadNameValue.Child( scenarioNameHandle );
     
-    panelMaterialAll := select( globalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
+    panelMaterialAll := select( globalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = businessTypeNameValue.GetValueAsString() );
     if ( not isnull( panelMaterialAll ) ) {
       panelMaterialAll.Delete();
     }
-    panelMaterialAll := globalOTDTable.PanelMaterialAll( relnew, 
-                                                         ReleaseDate  := releaseDateNameValue.GetValueAsString(),
-                                                         BusinessType := businessTypeNameValue.GetValueAsString(),
-                                                         ScenarioName := scenarioNameNameValue.GetValueAsString()
-                                                        );
+    panelMaterialAll := globalOTDSOP.PanelMaterialAll( relnew, 
+                                                       ReleaseDate  := releaseDateNameValue.GetValueAsString(),
+                                                       BusinessType := businessTypeNameValue.GetValueAsString(),
+                                                       ScenarioName := scenarioNameNameValue.GetValueAsString()
+                                                      );
     
     panelMaterialsHandle := requestnvt.GetHandle( "panelMaterials" );
     panelMaterialsNameValue := restPayloadNameValue.Child( panelMaterialsHandle );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def
index fa8fb18..700f5cb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def
@@ -5,7 +5,7 @@
   #keys: '[414702.0.375317354]'
   Body:
   [*
-    capacityAllocationResultsRuleConfiguration := GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relshadow );
+    capacityAllocationResultsRuleConfiguration := GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relshadow );
     
     DataHolderDialogData.Data( &capacityAllocationResultsRuleConfiguration );
     
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def
index 9d16e0c..b2227a1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def
@@ -12,20 +12,20 @@
       
       data := DataHolderDialogData.Data().WrappedInstance();
       if ( isnull( data ) ) {
-        GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relnew,
-                                                                   PanelMaterialCode  := efPanelMaterialCode.Text(),
-                                                                   ModuleMaterialCode := efModuleMaterialCode.Text(),
-                                                                   Division           := efDivision.Text(),
-                                                                   StockingPointID    := efStockingPointID.Text()
-                                                                  );
+        GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relnew,
+                                                                 PanelMaterialCode  := efPanelMaterialCode.Text(),
+                                                                 ModuleMaterialCode := efModuleMaterialCode.Text(),
+                                                                 Division           := efDivision.Text(),
+                                                                 StockingPointID    := efStockingPointID.Text()
+                                                                );
       } else {
         data.Delete();
-        GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relnew,
-                                                                   PanelMaterialCode  := efPanelMaterialCode.Text(),
-                                                                   ModuleMaterialCode := efModuleMaterialCode.Text(),
-                                                                   Division           := efDivision.Text(),
-                                                                   StockingPointID    := efStockingPointID.Text()
-                                                                  );
+        GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relnew,
+                                                                 PanelMaterialCode  := efPanelMaterialCode.Text(),
+                                                                 ModuleMaterialCode := efModuleMaterialCode.Text(),
+                                                                 Division           := efDivision.Text(),
+                                                                 StockingPointID    := efStockingPointID.Text()
+                                                                );
       }
       
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def
index 9a51849..f341bac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def
@@ -15,7 +15,7 @@
       Form.ApplyChanges();
       try {
         macroPlan := ExternalMDSEditor::MacroPlan( ddlSelectVersion.Data().DatasetName() ).AsMacroPlan();
-        GlobalOTDTable.SynchronizeOrders( macroPlan );
+        GlobalOTDSOP.SynchronizeOrders( macroPlan );
       
         Form.Close();
       
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def
index 94fd670..fda9845 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def
index 1633488..45f90a4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def
index 74d3b84..8bcbdf5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杞﹁浇" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杞﹁浇" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def
index a40ec23..f41fb03 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def
index 9a0ebc8..f18a133 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def
index f75df01..a05ee5e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def
index ac39931..622ed3d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def
index 795f493..478080e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
       this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
     *]
     GroupServerCalls: false
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def"
index 6a4fd16..d3833b6 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def"
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      CapacityAllocationResults::CreateDate( GlobalOTDTable, MacroPlan, DataHolderActiveScenario.Data() );
+      CapacityAllocationResults::CreateDate( GlobalOTDSOP, MacroPlan, DataHolderActiveScenario.Data() );
     *]
     GroupServerCalls: false
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def
index 8e85a2c..7336146 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'CapacityAllocationResultsRuleConfiguration'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuGenerateByPeggin.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuGenerateByPeggin.def
index 3bbd52f..1cafe5e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuGenerateByPeggin.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuGenerateByPeggin.def
@@ -16,7 +16,7 @@
   {
     Body:
     [*
-      CapacityAllocationResults::Test1( MacroPlan, GlobalOTDTable, selection );
+      CapacityAllocationResults::Test1( MacroPlan, GlobalOTDSOP, selection );
     *]
     GroupServerCalls: false
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def
index f5a7514..3d88e82 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialIT'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def
index 2e5c2f6..ee8d9a2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def
index 45047d0..9e7b501 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def
index 59acd48..8ccd983 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialAutomotiveElectronics'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def
index 153bf2b..795cb34 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def
index 5d5b00c..09e5f5d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def
index daa00b5..0c99db0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialSpecializedDisplay'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def
index f850744..76eda79 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def
index da65c1e..e9d7c35 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def
index 470bb1a..0763481 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialSportsHealth'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def
index a335367..075c0ad 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def
index 8f99fec..f32dc7f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def
index e55373e..a6fe84e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialTM17'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def
index b163a78..61927b9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def
index da9f657..af98ab2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def
index 68eb395..f97dc1b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialTM18'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def
index da89ecb..1ec6d4d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def
index b1e90c7..0a3f65b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def
index 351aa56..fbb4377 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialTianHua'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def
index 571614d..fd3b59e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def
index eec0cbb..0720784 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def
index 5b14efc..d135ecf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def
@@ -11,8 +11,8 @@
       BaseType: 'WebDataExtractor'
       Properties:
       [
-        DataType: 'GlobalOTDTable'
-        Source: 'GlobalOTDTable'
+        DataType: 'GlobalOTDSOP'
+        Source: 'GlobalOTDSOP'
         Taborder: 0
         Transformation: 'PanelMaterialAll.PanelMaterialVehicle'
       ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnCreated.def
index 5d3384d..1949110 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnCreated.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杞﹁浇" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杞﹁浇" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnDataChanged.def
index b38c87f..233ca90 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_DataHolderPanelMaterialVehicle_OnDataChanged.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杞﹁浇" );
+      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杞﹁浇" );
       if ( not isnull( targetPanelMaterialAll ) ) {
         this.Data( targetPanelMaterialAll );
       }

--
Gitblit v1.9.3