From 3c2c265358f34d6df273a2c8e4497880e735fe92 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 15 九月 2023 16:10:29 +0800
Subject: [PATCH] 面板拉料补充

---
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def                                                |    2 
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialAutomotiveElectronics.qbl                                                |   41 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnCancel_OnClick.def                                             |   15 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def       |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def |   19 
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialVehicle.qbl                                                              |   41 +
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def                   |   19 
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialIT.qbl                                                                   |   41 +
 _Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def                                                        |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def                                                    |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def                                                |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def                                 |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def                  |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/_ROOT_Component_FormPanelMaterialTM18.def                                        |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/_ROOT_Component_FormPanelMaterialSpecializedDisplay.def            |   21 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlActions.def                                                              |   40 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def                                        |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def                                  |   21 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlReceiveDatas.def                                                         |   98 ++++
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def                       |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def                                   |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormIT/_ROOT_Component_FormPanelMaterialIT.def                                                         |   21 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlSelectVersion.def                                                        |   46 ++
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def     |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def                             |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_ButtonFusionData_OnClick.def                                         |   17 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def                                     |   17 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def                          |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def            |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlContent.def                                                              |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/_ROOT_Component_FormPanelMaterialSportsHealth.def                        |   21 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def                                |   17 
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSportsHealth.qbl                                                         |   41 +
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTianHua.qbl                                                              |   41 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/_ROOT_Component_DialogFusionData.def                                                  |   23 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def                                          |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/_ROOT_Component_FormPanelMaterialVehicle.def                                  |   11 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def                                   |   19 
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSpecializedDisplay.qbl                                                   |   41 +
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM18.qbl                                                                 |   41 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def                                        |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/_ROOT_Component_FormPanelMaterialAutomotiveElectronics.def      |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def           |   19 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def                                       |   19 
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def                             |   17 
 _Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM17.qbl                                                                 |   41 +
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/_ROOT_Component_FormPanelMaterialTM17.def                                        |   21 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def                                                 |   30 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Method_FusionData.def                                                                 |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def                                                               |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def                                       |   19 
 _Main/BL/Type_GlobalDTOTable/Method_SynchronizeOrders.qbl                                                                                    |   31 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def                       |   17 
 _Main/BL/Type_PanelMaterialTianHua/_ROOT_Type_PanelMaterialTianHua.qbl                                                                       |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def                                        |    2 
 57 files changed, 1,227 insertions(+), 9 deletions(-)

diff --git a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeOrders.qbl b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeOrders.qbl
new file mode 100644
index 0000000..8d93ae2
--- /dev/null
+++ b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeOrders.qbl
@@ -0,0 +1,31 @@
+Quintiq file version 2.0
+#parent: #root
+Method SynchronizeOrders (
+  MacroPlan macroPlan
+)
+{
+  TextBody:
+  [*
+    info( "浜у搧涓暟锛�", macroPlan.Product_MP( relsize ) );
+    
+    traverse ( this, PanelMaterialAll, pma ) {
+      if ( pma.BusinessType() = "姹借溅鐢靛瓙" ) {
+        PanelMaterialAll::SynchronizePanelMaterialAutomotiveElectronics( macroPlan, pma );
+      } else if ( pma.BusinessType() = "IT" ) {
+        PanelMaterialAll::SynchronizePanelMaterialIT( macroPlan, pma );
+      } else if ( pma.BusinessType() = "涓撴樉" ) {
+        PanelMaterialAll::SynchronizePanelMaterialSpecializedDisplay( macroPlan, pma );
+      } else if ( pma.BusinessType() = "杩愬姩鍋ュ悍" ) {
+        PanelMaterialAll::SynchronizePanelMaterialSportsHealth( macroPlan, pma );
+      } else if ( pma.BusinessType() = "澶╁崕" ) {
+        PanelMaterialAll::SynchronizePanelMaterialTianHua( macroPlan, pma );
+      } else if ( pma.BusinessType() = "TM17" ) {
+        PanelMaterialAll::SynchronizePanelMaterialTM17( macroPlan, pma );
+      } else if ( pma.BusinessType() = "TM18" ) {
+        PanelMaterialAll::SynchronizePanelMaterialTM18( macroPlan, pma );
+      } else if ( pma.BusinessType() = "杞﹁浇" ) {
+        PanelMaterialAll::SynchronizePanelMaterialVehicle( macroPlan, pma );
+      }
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialAutomotiveElectronics.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialAutomotiveElectronics.qbl
new file mode 100644
index 0000000..0fc4454
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialAutomotiveElectronics.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialAutomotiveElectronics (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialAutomotiveElectronics, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialIT.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialIT.qbl
new file mode 100644
index 0000000..48f5eed
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialIT.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialIT (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialIT, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSpecializedDisplay.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSpecializedDisplay.qbl
new file mode 100644
index 0000000..75607f3
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSpecializedDisplay.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialSpecializedDisplay (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialSpecializedDisplay, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSportsHealth.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSportsHealth.qbl
new file mode 100644
index 0000000..f081fb6
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialSportsHealth.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialSportsHealth (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialSportsHealth, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM17.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM17.qbl
new file mode 100644
index 0000000..e4b7893
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM17.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialTM17 (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialTM17, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM18.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM18.qbl
new file mode 100644
index 0000000..52f3a01
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTM18.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialTM18 (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialTM18, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTianHua.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTianHua.qbl
new file mode 100644
index 0000000..9bd8092
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialTianHua.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialTianHua (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialTianHua, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialVehicle.qbl b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialVehicle.qbl
new file mode 100644
index 0000000..7881bb9
--- /dev/null
+++ b/_Main/BL/Type_PanelMaterialAll/StaticMethod_SynchronizePanelMaterialVehicle.qbl
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SynchronizePanelMaterialVehicle (
+  MacroPlan macroPlan,
+  PanelMaterialAll pma
+)
+{
+  TextBody:
+  [*
+    traverse ( pma, PanelMaterialVehicle, pm ) {
+      targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = pm.ProductID() );
+      if ( isnull( targetProduct_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪浜у搧锛�", pm.ProductID() );
+      }
+      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = "鎴愬搧浠�" );
+      if ( isnull( targetStockingPoint_MP ) ) {
+        error( "铻嶅悎鏁版嵁澶辫触锛屼笉瀛樺湪搴撳瓨鐐癸細", pm.StockingPointID() );
+      }
+          
+      CustomerOrder::Create( targetProduct_MP,
+                             targetStockingPoint_MP,
+                             pm.ID(),
+                             pm.OrderDate(),
+                             [Real]pm.Quantity(),
+                             [Real]pm.Price(),
+                             pm.PriorityName(),
+                             pm.SalesSegmentName(),
+                             pm.CurrencyID(),
+                             pm.UnitOfMeasureName(),
+                             false,
+                             pm.Customer(),
+                             pm.CustomerID(),
+                             "",
+                             "",
+                             true,
+                             true,
+                             false
+                            );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_PanelMaterialTianHua/_ROOT_Type_PanelMaterialTianHua.qbl b/_Main/BL/Type_PanelMaterialTianHua/_ROOT_Type_PanelMaterialTianHua.qbl
index d2d2fa2..95521ca 100644
--- a/_Main/BL/Type_PanelMaterialTianHua/_ROOT_Type_PanelMaterialTianHua.qbl
+++ b/_Main/BL/Type_PanelMaterialTianHua/_ROOT_Type_PanelMaterialTianHua.qbl
@@ -5,6 +5,6 @@
 {
   #keys: '5[414702.0.203671414][414702.0.203671412][0.0.0][414702.0.203671413][414702.0.203671415]'
   BaseType: Object
-  Description: '澶╄姳'
+  Description: '澶╁崕'
   StructuredName: 'PanelMaterialTianHuas'
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlActions.def
new file mode 100644
index 0000000..f8445bd
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlActions.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+Component pnlActions
+{
+  #keys: '[414702.0.213381912]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component btnOk
+    {
+      #keys: '[414702.0.213381916]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Label: 'OK'
+        Taborder: 0
+      ]
+    }
+    Component btnCancel
+    {
+      #keys: '[414702.0.213381918]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Label: 'Cancel'
+        Taborder: 1
+      ]
+    }
+  ]
+  Properties:
+  [
+    Alignment: 'trailing'
+    Border: true
+    ExcludeFromActiveComponent: true
+    FixedSize: true
+    Orientation: 'horizontal'
+    Padding: 'true'
+    Style: 'footer'
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlContent.def
new file mode 100644
index 0000000..2262cc3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlContent.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+  #keys: '[414702.0.213381910]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pnlReceiveDatas
+    #child: pnlSelectVersion
+  ]
+  Properties:
+  [
+    Padding: 'true'
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlReceiveDatas.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlReceiveDatas.def
new file mode 100644
index 0000000..450154d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlReceiveDatas.def
@@ -0,0 +1,98 @@
+Quintiq file version 2.0
+Component pnlReceiveDatas
+{
+  #keys: '[414702.0.213382696]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component lblTianHua
+    {
+      #keys: '[414702.0.212183780]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: '澶╁崕锛�'
+        Taborder: 0
+      ]
+    }
+    Component lblSpecializedDisplay
+    {
+      #keys: '[414702.0.212183799]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: '涓撴樉锛�'
+        Taborder: 1
+      ]
+    }
+    Component lblIT
+    {
+      #keys: '[414702.0.212183811]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: 'IT锛�'
+        Taborder: 2
+      ]
+    }
+    Component lblMaterialVehicle
+    {
+      #keys: '[414702.0.212183824]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: '杞﹁浇锛�'
+        Taborder: 3
+      ]
+    }
+    Component lblTM17
+    {
+      #keys: '[414702.0.212183836]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: 'TM17锛�'
+        Taborder: 4
+      ]
+    }
+    Component lblTM18
+    {
+      #keys: '[414702.0.212183849]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: 'TM18锛�'
+        Taborder: 5
+      ]
+    }
+    Component lblSportsHealth
+    {
+      #keys: '[414702.0.212183868]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: '杩愬姩鍋ュ悍锛�'
+        Taborder: 6
+      ]
+    }
+    Component lblAutomotiveElectronics
+    {
+      #keys: '[414702.0.212172592]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        Label: '姹借溅鐢靛瓙锛�'
+        Taborder: 7
+      ]
+    }
+  ]
+  Properties:
+  [
+    Border: true
+    FixedSize: true
+    MinimumColumns: 1
+    MinimumRows: 1
+    Taborder: 0
+    Title: '鏈�鍚庢帴鏀舵椂闂�'
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlSelectVersion.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlSelectVersion.def
new file mode 100644
index 0000000..54c1ea0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Component_pnlSelectVersion.def
@@ -0,0 +1,46 @@
+Quintiq file version 2.0
+Component pnlSelectVersion
+{
+  #keys: '[414702.0.215071882]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component ddlSelectVersion
+    {
+      #keys: '[414702.0.215071927]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ScenarioMP'
+      Children:
+      [
+        Component deSelectVersion
+        {
+          #keys: '[414702.0.215071929]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'ScenarioManager'
+            FixedFilter: 'object.IsLoaded() and not object.IsDeleted()'
+            Source: 'ScenarioManager'
+            Taborder: 0
+            Transformation: 'ScenarioMP'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '閫夋嫨鐗堟湰'
+        NumberOfColumns: 50
+        Taborder: 0
+      ]
+    }
+  ]
+  Properties:
+  [
+    Border: true
+    FixedSize: true
+    MinimumColumns: 1
+    MinimumRows: 1
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Method_FusionData.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Method_FusionData.def
new file mode 100644
index 0000000..2c9a949
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Method_FusionData.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#parent: #root
+Method FusionData () id:Method_DialogFusionData_FusionData
+{
+  #keys: '[414702.0.213324055]'
+  Body:
+  [*
+    ApplicationMacroPlanner.ShowFormModal( this );
+  *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnCancel_OnClick.def
new file mode 100644
index 0000000..389a5c1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnCancel_OnClick.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnCancel
+Response OnClick () id:Response_pnlActions_btnCancel_OnClick
+{
+  #keys: '[414702.0.213381922]'
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      Form.Close();
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..9a51849
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlActions_btnOk_OnClick.def
@@ -0,0 +1,30 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnOk
+Response OnClick () id:Response_pnlActions_btnOk_OnClick
+{
+  #keys: '[414702.0.213381921]'
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  Precondition:
+  [*
+    return not isnull( GlobalOTDTable );
+  *]
+  QuillAction
+  {
+    Body:
+    [*
+      Form.ApplyChanges();
+      try {
+        macroPlan := ExternalMDSEditor::MacroPlan( ddlSelectVersion.Data().DatasetName() ).AsMacroPlan();
+        GlobalOTDTable.SynchronizeOrders( macroPlan );
+      
+        Form.Close();
+      
+        WebMessageBox::Success( "铻嶅悎鏁版嵁鎴愬姛锛�", true );
+      } onerror {
+        Form.Close();
+        WebMessageBox::Error( e.GeneralInformation(), true );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def
new file mode 100644
index 0000000..94fd670
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblAutomotiveElectronics
+Response OnCreated () id:Response_pnlReceiveDatas_lblAutomotiveElectronics_OnCreated
+{
+  #keys: '[414702.0.215042189]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..1633488
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblIT_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblIT
+Response OnCreated () id:Response_pnlReceiveDatas_lblIT_OnCreated
+{
+  #keys: '[414702.0.215041419]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..74d3b84
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblMaterialVehicle
+Response OnCreated () id:Response_pnlReceiveDatas_lblMaterialVehicle_OnCreated
+{
+  #keys: '[414702.0.215041505]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..a40ec23
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblSpecializedDisplay
+Response OnCreated () id:Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated
+{
+  #keys: '[414702.0.215041332]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..9a0ebc8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSportsHealth_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblSportsHealth
+Response OnCreated () id:Response_pnlReceiveDatas_lblSportsHealth_OnCreated
+{
+  #keys: '[414702.0.215042103]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..f75df01
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM17_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblTM17
+Response OnCreated () id:Response_pnlReceiveDatas_lblTM17_OnCreated
+{
+  #keys: '[414702.0.215041591]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..6076d86
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTM18_OnCreated.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblTM18
+Response OnCreated () id:Response_pnlReceiveDatas_lblTM18_OnCreated
+{
+  #keys: '[414702.0.215041677]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  Precondition:
+  [*
+    
+  *]
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, 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
new file mode 100644
index 0000000..795f493
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblTianHua_OnCreated.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pnlReceiveDatas/lblTianHua
+Response OnCreated () id:Response_pnlReceiveDatas_lblTianHua_OnCreated
+{
+  #keys: '[414702.0.213744488]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
+      this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "鏃犳暟鎹�" ) );
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/_ROOT_Component_DialogFusionData.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/_ROOT_Component_DialogFusionData.def
new file mode 100644
index 0000000..065348b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFusionData/_ROOT_Component_DialogFusionData.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogFusionData
+{
+  #keys: '[414702.0.213381908]'
+  BaseType: 'WebForm'
+  Children:
+  [
+    #child: pnlContent
+    #child: pnlActions
+  ]
+  Properties:
+  [
+    Alignment: 'trailing'
+    EnterButton: 'btnOk'
+    EscapeButton: 'btnCancel'
+    ExcludeFromActiveComponent: true
+    Image: 'CD_GOLD'
+    Padding: 'false'
+    Title: '铻嶅悎鏁版嵁'
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def
index 6e50b8d..f5a7514 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Component_ListPanelMaterialIT.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def
new file mode 100644
index 0000000..2e5c2f6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelIT
+Response OnCreated () id:Response_FormPanelMaterialIT_DataHolderPanelIT_OnCreated
+{
+  #keys: '[414702.0.211822171]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def
new file mode 100644
index 0000000..45047d0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/Response_DataHolderPanelIT_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelIT
+Response OnDataChanged () id:Response_FormPanelMaterialIT_DataHolderPanelIT_OnDataChanged
+{
+  #keys: '[414702.0.211822170]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "IT" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormIT/_ROOT_Component_FormPanelMaterialIT.def b/_Main/UI/MacroPlannerWebApp/Component_FormIT/_ROOT_Component_FormPanelMaterialIT.def
index 26a7616..c63195b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormIT/_ROOT_Component_FormPanelMaterialIT.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormIT/_ROOT_Component_FormPanelMaterialIT.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialIT
+    Component DataHolderPanelIT
+    {
+      #keys: '[414702.0.211822173]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent
+    {
+      #keys: '[414702.0.211822232]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelIT.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def
index 9ca05a6..59acd48 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Component_ListPanelMaterialAutomotiveElectronics.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def
new file mode 100644
index 0000000..153bf2b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelAutomotiveElectronics
+Response OnCreated () id:Response_FormPanelMaterialAutomotiveElectronics_DataHolderPanelAutomotiveElectronics_OnCreated
+{
+  #keys: '[414702.0.211782554]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def
new file mode 100644
index 0000000..5d5b00c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/Response_DataHolderPanelAutomotiveElectronics_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelAutomotiveElectronics
+Response OnDataChanged () id:Response_FormPanelMaterialAutomotiveElectronics_DataHolderPanelAutomotiveElectronics_OnDataChanged
+{
+  #keys: '[414702.0.211782555]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "姹借溅鐢靛瓙" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/_ROOT_Component_FormPanelMaterialAutomotiveElectronics.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/_ROOT_Component_FormPanelMaterialAutomotiveElectronics.def
index 8645afa..bf0aa3c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/_ROOT_Component_FormPanelMaterialAutomotiveElectronics.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialAutomotiveElectronics/_ROOT_Component_FormPanelMaterialAutomotiveElectronics.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialAutomotiveElectronics
+    Component DataHolderPanelAutomotiveElectronics
+    {
+      #keys: '[414702.0.211782557]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent id:LabelLastSent_680
+    {
+      #keys: '[414702.0.211782616]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelAutomotiveElectronics.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def
index 961c6a3..daa00b5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Component_ListPanelMaterialSpecializedDisplay.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def
new file mode 100644
index 0000000..f850744
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelSpecializedDisplay
+Response OnCreated () id:Response_FormPanelMaterialSpecializedDisplay_DataHolderPanelSpecializedDisplay_OnCreated
+{
+  #keys: '[414702.0.211782227]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def
new file mode 100644
index 0000000..da65c1e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/Response_DataHolderPanelSpecializedDisplay_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelSpecializedDisplay
+Response OnDataChanged () id:Response_FormPanelMaterialSpecializedDisplay_DataHolderPanelSpecializedDisplay_OnDataChanged
+{
+  #keys: '[414702.0.211782228]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "涓撴樉" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/_ROOT_Component_FormPanelMaterialSpecializedDisplay.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/_ROOT_Component_FormPanelMaterialSpecializedDisplay.def
index 5f6da76..74e4ff6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/_ROOT_Component_FormPanelMaterialSpecializedDisplay.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSpecializedDisplay/_ROOT_Component_FormPanelMaterialSpecializedDisplay.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialSpecializedDisplay
+    Component DataHolderPanelSpecializedDisplay
+    {
+      #keys: '[414702.0.211782230]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent id:LabelLastSent_452
+    {
+      #keys: '[414702.0.211519610]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelSpecializedDisplay.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def
index 8896592..470bb1a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Component_ListPanelMaterialSportsHealth.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def
new file mode 100644
index 0000000..a335367
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelSportsHealth
+Response OnCreated () id:Response_FormPanelMaterialSportsHealth_DataHolderPanelSportsHealth_OnCreated
+{
+  #keys: '[414702.0.211819877]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def
new file mode 100644
index 0000000..8f99fec
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelSportsHealth
+Response OnDataChanged () id:Response_FormPanelMaterialSportsHealth_DataHolderPanelSportsHealth_OnDataChanged
+{
+  #keys: '[414702.0.211819876]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "杩愬姩鍋ュ悍" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/_ROOT_Component_FormPanelMaterialSportsHealth.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/_ROOT_Component_FormPanelMaterialSportsHealth.def
index 99b069a..6e01214 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/_ROOT_Component_FormPanelMaterialSportsHealth.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/_ROOT_Component_FormPanelMaterialSportsHealth.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialSportsHealth
+    Component DataHolderPanelSportsHealth
+    {
+      #keys: '[414702.0.211819879]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent
+    {
+      #keys: '[414702.0.211821961]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelSportsHealth.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def
index 577601d..e55373e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Component_ListPanelMaterialTM.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def
new file mode 100644
index 0000000..b163a78
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelTM17
+Response OnCreated () id:Response_FormPanelMaterialTM17_DataHolderPanelTM17_OnCreated
+{
+  #keys: '[414702.0.211884009]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def
new file mode 100644
index 0000000..da9f657
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelTM17
+Response OnDataChanged () id:Response_FormPanelMaterialTM17_DataHolderPanelTM17_OnDataChanged
+{
+  #keys: '[414702.0.211884008]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/_ROOT_Component_FormPanelMaterialTM17.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/_ROOT_Component_FormPanelMaterialTM17.def
index 640a89f..66b4230 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/_ROOT_Component_FormPanelMaterialTM17.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/_ROOT_Component_FormPanelMaterialTM17.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialTM
+    Component DataHolderPanelTM17
+    {
+      #keys: '[414702.0.211884011]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent
+    {
+      #keys: '[414702.0.211884076]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelTM17.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def
index 6bc868e..68eb395 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Component_ListPanelMaterialTM.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def
new file mode 100644
index 0000000..da89ecb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelTM18
+Response OnCreated () id:Response_FormPanelMaterialTM18_DataHolderPanelTM18_OnCreated
+{
+  #keys: '[414702.0.211683113]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def
new file mode 100644
index 0000000..b1e90c7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/Response_DataHolderPanelTM18_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelTM18
+Response OnDataChanged () id:Response_FormPanelMaterialTM18_DataHolderPanelTM18_OnDataChanged
+{
+  #keys: '[414702.0.211683114]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM18" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/_ROOT_Component_FormPanelMaterialTM18.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/_ROOT_Component_FormPanelMaterialTM18.def
index 26cfe89..807ee1f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/_ROOT_Component_FormPanelMaterialTM18.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM18/_ROOT_Component_FormPanelMaterialTM18.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialTM
+    Component DataHolderPanelTM18
+    {
+      #keys: '[414702.0.211683116]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent id:LabelLastSent_969
+    {
+      #keys: '[414702.0.211561471]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelTM18.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def
index 3cbc18f..351aa56 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Component_ListPanelMaterialTianHua.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 0
+    Taborder: 2
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def
new file mode 100644
index 0000000..571614d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelTianHua
+Response OnCreated () id:Response_FormPanelMaterialTianHua_DataHolderPanelTianHua_OnCreated
+{
+  #keys: '[414702.0.211890766]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def
new file mode 100644
index 0000000..eec0cbb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/Response_DataHolderPanelTianHua_OnDataChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: DataHolderPanelTianHua
+Response OnDataChanged () id:Response_FormPanelMaterialTianHua_DataHolderPanelTianHua_OnDataChanged
+{
+  #keys: '[414702.0.211890767]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  QuillAction
+  {
+    Body:
+    [*
+      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "澶╁崕" );
+      if ( not isnull( targetPanelMaterialAll ) ) {
+        this.Data( targetPanelMaterialAll );
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def
index 3952fc2..31b93b5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def
@@ -8,6 +8,27 @@
   Children:
   [
     #child: ListPanelMaterialTianHua
+    Component DataHolderPanelTianHua
+    {
+      #keys: '[414702.0.211890769]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'PanelMaterialAll'
+      Properties:
+      [
+        Taborder: 0
+      ]
+    }
+    Component LabelLastSent id:LabelLastSent_662
+    {
+      #keys: '[414702.0.211781782]'
+      BaseType: 'WebLabel'
+      Properties:
+      [
+        DataBinding: 'DataHolderPanelTianHua.Data.ReleaseDate'
+        Label: '涓婃鍙戦�佹椂闂达細'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def
index 85aa088..5b14efc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Component_ListPanelMaterialVehicle.def
@@ -36,6 +36,6 @@
   ]
   Properties:
   [
-    Taborder: 2
+    Taborder: 3
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_ButtonFusionData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_ButtonFusionData_OnClick.def
new file mode 100644
index 0000000..5062d5f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/Response_ButtonFusionData_OnClick.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ButtonFusionData
+Response OnClick () id:Response_FormPanelMaterialVehicle_ButtonFusionData_OnClick
+{
+  #keys: '[414702.0.212120934]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  QuillAction
+  {
+    Body:
+    [*
+      dlg := construct( DialogFusionData );
+      dlg.FusionData();
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/_ROOT_Component_FormPanelMaterialVehicle.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/_ROOT_Component_FormPanelMaterialVehicle.def
index dc2fe60..a4436ed 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/_ROOT_Component_FormPanelMaterialVehicle.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/_ROOT_Component_FormPanelMaterialVehicle.def
@@ -29,6 +29,17 @@
         Taborder: 0
       ]
     }
+    Component ButtonFusionData
+    {
+      #keys: '[414702.0.212142601]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'COOLING_TOWER'
+        Label: '铻嶅悎鏁版嵁'
+        Taborder: 2
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3