From 7712f55bb88b1ccaef1ad34e18b56d6494d83932 Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期五, 15 九月 2023 17:05:50 +0800
Subject: [PATCH] 填产

---
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_BusinessType.qbl                                                                     |    6 
 _var/_Main/ProjSettings/MacroPlannerWebApp/Views/填产方案列表.vw                                                                                     |   11 
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID.qbl                                                                        |    6 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/_ROOT_Component_DialogFillingOrderScheme.def                                    |   32 +
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_BusinessType.qbl                                                                           |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_BusinessType.qbl                                                                        |    6 
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_OrderType.qbl                                                                        |    6 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_FillingType.qbl                                                                         |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_IsRelease.qbl                                                                              |    7 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_ListFillingCapacityOrder_MenuSaveScheme_OnClick.def                    |    4 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_BusinessType.qbl                                                                        |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SalesSegmentName.qbl                                                                       |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_Customer.qbl                                                                            |    6 
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_StockingPointID.qbl                                                                  |    6 
 _Main/BL/Type_HistoricalFillingCapacityOrder/_ROOT_Type_HistoricalFillingCapacityOrder.qbl                                                     |    9 
 _Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listActionBarPageHistoricalFillingCapacityOrder.def         |   10 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuSalesFillingCapacity.def                                    |   36 +
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews#633.def                                       |   22 +
 _Main/BL/Relations/Relation_FilllingCapacityOrderScheme_FillingCapacityOrder_FillingCapacityOrd.qbl                                            |   23 +
 _Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_GetFillingSchemeDetails.qbl                                                             |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def                                     |   24 +
 _Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/_ROOT_Component_FormHistoricalFillingCapacityOrder.def                |   12 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID.qbl                                                                           |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_CustomerID.qbl                                                                             |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_ReleaseFillingScheme.qbl                                                                |   22 +
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlActions.def                                                        |   40 +
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_CustomerID.qbl                                                                       |    6 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Method_OpenScheme.def                                                           |   10 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingSchem.def |   19 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Quantity.qbl                                                                            |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProfitabilityLevel.qbl                                                                  |    7 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listContextMenuFillingSchemeDetail.def                             |   10 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderType.qbl                                                                           |    7 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingCapac.def |   18 
 _Main/BL/Relations/Relation_HistoricalFillingCapacityOrder_MacroPlan_MacroPlan_HistoricalFillin.qbl                                            |   23 +
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeName.qbl                                                                             |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl                                                    |   48 ++
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_VerNo.qbl                                                                               |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_UnitOfMeasureName.qbl                                                                |    6 
 _Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_CustomerID.qbl                                                                          |    6 
 _Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SalesSegmentName.qbl                                                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def                                                        |   59 ++
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/_ROOT_Component_FormFillingSchemeDetail#802.def                              |   41 +
 _Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SchemeName.qbl                                                                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def                                                   |    5 
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_VerNo.qbl                                                                            |    6 
 _Main/BL/Type_FillingCapacityOrder/DefaultValue_IsFilling.qbl                                                                                  |    7 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/_ROOT_Component_FormFillingScheme.def                                                  |   22 +
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listActionBarPageFillingSchemeDetail.def                           |   10 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnOk_OnClick.def                                           |   21 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_StockingPointID.qbl                                                                     |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_UnitOfMeasureName.qbl                                                                   |    7 
 _Main/BL/Type_FilllingCapacityOrderScheme/_ROOT_Type_FilllingCapacityOrderScheme.qbl                                                           |    9 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_OnClick.def                                                 |   32 +
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID0.qbl                                                                       |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_Menurelease.def                                                              |   23 +
 _Main/BL/Type_FillingCapacityOrder/Attribute_SchemeName.qbl                                                                                    |    7 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnCancel_OnClick.def                                       |   15 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_CustomerID.qbl                                                                          |    7 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def                                      |    1 
 _Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listContextMenuHistoricalFillingCapacityOrder.def           |   10 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageSales.def                                                 |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_ListHistoricalFillingCapacityOrder.def                      |   41 +
 _Main/UI/MacroPlannerWebApp/Views/填产方案列表.vw                                                                                                    |  194 ++++++++
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_listActionBarPageFillingScheme.def                                           |   10 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Customer.qbl                                                                            |    7 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Component_ListFillingCapacityOrder.def                                          |    1 
 _Main/BL/Type_CustomerAndForecastOrder/StaticMethod_CreateFillingCapacityOrder.qbl                                                             |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_ListFillingSchemeDetail.def                                        |   41 +
 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityScheme/Component_ListCustomerAndFillingCapacityOrder.def                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Response_pnlActions_btnOk_OnClick.def                                   |    5 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_RewindsQuantityToReduced.qbl                                                            |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderDate.qbl                                                                           |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID0.qbl                                                                          |    7 
 _Main/BL/Relations/Relation_FilllingCapacityOrderScheme_MacroPlan_MacroPlan_FilllingCapacityOrd.qbl                                            |   23 +
 _Main/BL/Type_FillingCapacityOrder/Attribute_IsFilling.qbl                                                                                     |    7 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/_ROOT_Component_DialogFillingCustomerAndForecast.def                    |    2 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ForecastDemandDate.qbl                                                                  |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_SalesAmount.qbl                                                                         |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderID.qbl                                                                             |    7 
 _Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_Customer.qbl                                                                         |    6 
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_Customer.qbl                                                                               |    7 
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlContent.def                                                        |   24 +
 _Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeDate.qbl                                                                             |    7 
 84 files changed, 1,254 insertions(+), 11 deletions(-)

diff --git a/_Main/BL/Relations/Relation_FilllingCapacityOrderScheme_FillingCapacityOrder_FillingCapacityOrd.qbl b/_Main/BL/Relations/Relation_FilllingCapacityOrderScheme_FillingCapacityOrder_FillingCapacityOrd.qbl
new file mode 100644
index 0000000..037c40a
--- /dev/null
+++ b/_Main/BL/Relations/Relation_FilllingCapacityOrderScheme_FillingCapacityOrder_FillingCapacityOrd.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation FilllingCapacityOrderScheme_FillingCapacityOrder_FillingCapacityOrder_FilllingCapacityOrderScheme
+{
+  #keys: '1[414382.0.424779922]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide FillingCapacityOrder
+  {
+    #keys: '3[414382.0.424779924][414382.0.424779923][414382.0.424779925]'
+    Cardinality: '1toN'
+    ObjectDefinition: FilllingCapacityOrderScheme
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide FilllingCapacityOrderScheme
+  {
+    #keys: '3[414382.0.424779927][414382.0.424779926][414382.0.424779928]'
+    Cardinality: '0to1'
+    ObjectDefinition: FillingCapacityOrder
+    OwningSide: 'Reference'
+  }
+}
diff --git a/_Main/BL/Relations/Relation_FilllingCapacityOrderScheme_MacroPlan_MacroPlan_FilllingCapacityOrd.qbl b/_Main/BL/Relations/Relation_FilllingCapacityOrderScheme_MacroPlan_MacroPlan_FilllingCapacityOrd.qbl
new file mode 100644
index 0000000..ed28adb
--- /dev/null
+++ b/_Main/BL/Relations/Relation_FilllingCapacityOrderScheme_MacroPlan_MacroPlan_FilllingCapacityOrd.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation FilllingCapacityOrderScheme_MacroPlan_MacroPlan_FilllingCapacityOrderScheme
+{
+  #keys: '1[414382.0.424779906]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide MacroPlan
+  {
+    #keys: '3[414382.0.424779908][414382.0.424779907][414382.0.424779909]'
+    Cardinality: '0to1'
+    ObjectDefinition: FilllingCapacityOrderScheme
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide FilllingCapacityOrderScheme
+  {
+    #keys: '3[414382.0.424779911][414382.0.424779910][414382.0.424779912]'
+    Cardinality: '1toN'
+    ObjectDefinition: MacroPlan
+    OwningSide: 'Owned'
+  }
+}
diff --git a/_Main/BL/Relations/Relation_HistoricalFillingCapacityOrder_MacroPlan_MacroPlan_HistoricalFillin.qbl b/_Main/BL/Relations/Relation_HistoricalFillingCapacityOrder_MacroPlan_MacroPlan_HistoricalFillin.qbl
new file mode 100644
index 0000000..c894832
--- /dev/null
+++ b/_Main/BL/Relations/Relation_HistoricalFillingCapacityOrder_MacroPlan_MacroPlan_HistoricalFillin.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation HistoricalFillingCapacityOrder_MacroPlan_MacroPlan_HistoricalFillingCapacityOrder
+{
+  #keys: '1[414382.0.440654894]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide MacroPlan
+  {
+    #keys: '3[414382.0.440654896][414382.0.440654895][414382.0.440654897]'
+    Cardinality: '0to1'
+    ObjectDefinition: HistoricalFillingCapacityOrder
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide HistoricalFillingCapacityOrder
+  {
+    #keys: '3[414382.0.440654899][414382.0.440654898][414382.0.440654900]'
+    Cardinality: '1toN'
+    ObjectDefinition: MacroPlan
+    OwningSide: 'Owned'
+  }
+}
diff --git a/_Main/BL/Type_CustomerAndForecastOrder/StaticMethod_CreateFillingCapacityOrder.qbl b/_Main/BL/Type_CustomerAndForecastOrder/StaticMethod_CreateFillingCapacityOrder.qbl
index dfa4a28..720a7bb 100644
--- a/_Main/BL/Type_CustomerAndForecastOrder/StaticMethod_CreateFillingCapacityOrder.qbl
+++ b/_Main/BL/Type_CustomerAndForecastOrder/StaticMethod_CreateFillingCapacityOrder.qbl
@@ -9,9 +9,9 @@
   [*
     // NBoTk Sep-13-2023 (created)
     
-    owner.CustomerAndForecastOrder(relnew,OrderID := data.OrderID(),ProductID := data.ProductID(),BusinessType := data.BusinessType(),Customer := data.BusinessType(),CustomerID := data.CustomerID(),
+    owner.FillingCapacityOrder(relnew,ProductID := data.ProductID(),BusinessType := data.BusinessType(),Customer := data.Customer(),CustomerID := data.CustomerID(),
                                     Quantity := data.Quantity(),UnitOfMeasureName := data.UnitOfMeasureName(),PanelBigSheetQuantity := data.PanelBigSheetQuantity(),SalesAmount := data.SalesAmount(),
-                                    ForecastDemandDate := data.ForecastDemandDate(),DemandDate := data.DemandDate()
+                                    ForecastDemandDate := data.ForecastDemandDate(),DemandDate := data.DemandDate(),VerNo := data.VerNo()
                                     );
   *]
 }
diff --git a/_Main/BL/Type_FillingCapacityOrder/Attribute_IsFilling.qbl b/_Main/BL/Type_FillingCapacityOrder/Attribute_IsFilling.qbl
new file mode 100644
index 0000000..71fc4b0
--- /dev/null
+++ b/_Main/BL/Type_FillingCapacityOrder/Attribute_IsFilling.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsFilling
+{
+  #keys: '3[414382.0.419264586][414382.0.419264585][414382.0.419264587]'
+  ValueType: Boolean
+}
diff --git a/_Main/BL/Type_FillingCapacityOrder/Attribute_SchemeName.qbl b/_Main/BL/Type_FillingCapacityOrder/Attribute_SchemeName.qbl
new file mode 100644
index 0000000..ff6d517
--- /dev/null
+++ b/_Main/BL/Type_FillingCapacityOrder/Attribute_SchemeName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SchemeName
+{
+  #keys: '3[414382.0.424779892][414382.0.424779891][414382.0.424779893]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FillingCapacityOrder/DefaultValue_IsFilling.qbl b/_Main/BL/Type_FillingCapacityOrder/DefaultValue_IsFilling.qbl
new file mode 100644
index 0000000..aa634ef
--- /dev/null
+++ b/_Main/BL/Type_FillingCapacityOrder/DefaultValue_IsFilling.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  ISOValue: 'false'
+  TargetAttribute: IsFilling
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_BusinessType.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_BusinessType.qbl
new file mode 100644
index 0000000..f3ff6a3
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_BusinessType.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute BusinessType
+{
+  #keys: '3[414382.0.424779940][414382.0.424779939][414382.0.424779941]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_Customer.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_Customer.qbl
new file mode 100644
index 0000000..a8ac1aa
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_Customer.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Customer
+{
+  #keys: '3[414382.0.424779948][414382.0.424779947][414382.0.424779949]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_CustomerID.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_CustomerID.qbl
new file mode 100644
index 0000000..75c43a9
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_CustomerID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CustomerID
+{
+  #keys: '3[414382.0.424779952][414382.0.424779951][414382.0.424779953]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_IsRelease.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_IsRelease.qbl
new file mode 100644
index 0000000..37a6c75
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_IsRelease.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsRelease
+{
+  #keys: '3[414382.0.428376803][414382.0.428376802][414382.0.428376804]'
+  ValueType: Boolean
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SalesSegmentName.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SalesSegmentName.qbl
new file mode 100644
index 0000000..0beee5a
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SalesSegmentName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SalesSegmentName
+{
+  #keys: '3[414382.0.424779944][414382.0.424779943][414382.0.424779945]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeDate.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeDate.qbl
new file mode 100644
index 0000000..f6d81ba
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SchemeDate
+{
+  #keys: '3[414382.0.424779957][414382.0.424779956][414382.0.424779958]'
+  ValueType: Date
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeName.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeName.qbl
new file mode 100644
index 0000000..eae286a
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/Attribute_SchemeName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SchemeName
+{
+  #keys: '3[414382.0.424779936][414382.0.424779935][414382.0.424779937]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_BusinessType.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_BusinessType.qbl
new file mode 100644
index 0000000..1672b03
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_BusinessType.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: BusinessType
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_Customer.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_Customer.qbl
new file mode 100644
index 0000000..e02a336
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_Customer.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: Customer
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_CustomerID.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_CustomerID.qbl
new file mode 100644
index 0000000..66ae438
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_CustomerID.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: CustomerID
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SalesSegmentName.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SalesSegmentName.qbl
new file mode 100644
index 0000000..521966d
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SalesSegmentName.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: SalesSegmentName
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SchemeName.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SchemeName.qbl
new file mode 100644
index 0000000..d8220c4
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/DefaultValue_SchemeName.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: SchemeName
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
new file mode 100644
index 0000000..48ac995
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
@@ -0,0 +1,48 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod CreateFillingCapacityOrderScheme (
+  MacroPlan owner,
+  String schemeName
+)
+{
+  TextBody:
+  [*
+    // NBoTk Sep-14-2023 (created)
+    
+    fillingCapacityOrders := selectset( owner,FillingCapacityOrder,fillingOrder,
+                                        not fillingOrder.IsFilling()
+                                        );
+    
+    // customer
+    customerList := selectvalues( fillingCapacityOrders,Elements,e,
+                                  e.Customer());
+    customer := customerList.Concatenate( ",")
+    
+    // customerID
+    customerIDList := selectvalues( fillingCapacityOrders,Elements,e,
+                                   e.CustomerID());
+    customerID := customerIDList.Concatenate( ",")
+    
+    // businessType
+    businessTypeList := selectvalues( fillingCapacityOrders,Elements,e,
+                                      e.BusinessType());
+    businessType := businessTypeList.Concatenate( ",")
+    
+    // salesSegmentName
+    salesSegmentNameList := selectvalues( fillingCapacityOrders,Elements,e,
+                                          e.SalesSegmentName());
+    salesSegmentName := salesSegmentNameList.Concatenate( ",")
+    
+    schemeDate := Date::Today();
+    
+    filllingCapacityOrderScheme := owner.FilllingCapacityOrderScheme(relnew,SchemeName := schemeName,SchemeDate := schemeDate,BusinessType := businessType,Customer := customer,CustomerID := customerID,
+                                                                      SalesSegmentName := salesSegmentName);
+    
+    traverse( fillingCapacityOrders,Elements,e)
+    {
+      e.SchemeName(schemeName);
+      e.IsFilling(true);
+      filllingCapacityOrderScheme.FillingCapacityOrder(relinsert, e);
+    }
+  *]
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_GetFillingSchemeDetails.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_GetFillingSchemeDetails.qbl
new file mode 100644
index 0000000..f5de5fb
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_GetFillingSchemeDetails.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetFillingSchemeDetails (
+  MacroPlan owner,
+  String schemeName
+) as owning FillingCapacityOrders
+{
+  TextBody:
+  [*
+    // NBoTk Sep-14-2023 (created)
+    
+    
+    return selectset( owner,FillingCapacityOrder,order,
+                      order.SchemeName() = schemeName);
+  *]
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_ReleaseFillingScheme.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_ReleaseFillingScheme.qbl
new file mode 100644
index 0000000..1cb3797
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_ReleaseFillingScheme.qbl
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod ReleaseFillingScheme (
+  MacroPlan owner,
+  FilllingCapacityOrderScheme scheme
+)
+{
+  TextBody:
+  [*
+    // NBoTk Sep-14-2023 (created)
+    
+    traverse( scheme,FillingCapacityOrder,order)
+    {
+        owner.HistoricalFillingCapacityOrder(relnew,BusinessType := order.BusinessType(),Customer := order.Customer(),CustomerID := order.CustomerID(),
+                                     OrderDate := order.OrderDate(),OrderID := "",OrderType := "",
+                                    ProductID := order.ProductID(),Quantity := order.Quantity(),SalesAmount := order.SalesAmount(),
+                                    StockingPointID := order.StockingPointID(),UnitOfMeasureName := order.UnitOfMeasureName(),
+                                    VerNo := order.VerNo()
+                                    );
+    }
+  *]
+}
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/_ROOT_Type_FilllingCapacityOrderScheme.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/_ROOT_Type_FilllingCapacityOrderScheme.qbl
new file mode 100644
index 0000000..f6cd8ba
--- /dev/null
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/_ROOT_Type_FilllingCapacityOrderScheme.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type FilllingCapacityOrderScheme
+{
+  #keys: '5[414382.0.424779903][414382.0.424779901][0.0.0][414382.0.424779902][414382.0.424779904]'
+  BaseType: Object
+  StructuredName: 'FilllingCapacityOrderSchemes'
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_BusinessType.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_BusinessType.qbl
new file mode 100644
index 0000000..b115460
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_BusinessType.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute BusinessType
+{
+  #keys: '3[414382.0.440654932][414382.0.440654931][414382.0.440654933]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Customer.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Customer.qbl
new file mode 100644
index 0000000..93c7c88
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Customer.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Customer
+{
+  #keys: '3[414382.0.440654949][414382.0.440654948][414382.0.440654950]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_CustomerID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_CustomerID.qbl
new file mode 100644
index 0000000..d19bfe9
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_CustomerID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CustomerID
+{
+  #keys: '3[414382.0.440654952][414382.0.440654951][414382.0.440654953]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_FillingType.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_FillingType.qbl
new file mode 100644
index 0000000..ed1f80b
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_FillingType.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute FillingType
+{
+  #keys: '3[414382.0.440654936][414382.0.440654935][414382.0.440654937]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ForecastDemandDate.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ForecastDemandDate.qbl
new file mode 100644
index 0000000..af79bdf
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ForecastDemandDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ForecastDemandDate
+{
+  #keys: '3[414382.0.440654980][414382.0.440654979][414382.0.440654981]'
+  ValueType: Date
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderDate.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderDate.qbl
new file mode 100644
index 0000000..f308319
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderDate
+{
+  #keys: '3[414382.0.440654925][414382.0.440654924][414382.0.440654926]'
+  ValueType: Date
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderID.qbl
new file mode 100644
index 0000000..d60f646
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderID
+{
+  #keys: '3[414382.0.440654912][414382.0.440654911][414382.0.440654913]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderType.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderType.qbl
new file mode 100644
index 0000000..96c9741
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_OrderType.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderType
+{
+  #keys: '3[414382.0.440654922][414382.0.440654921][414382.0.440654923]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID.qbl
new file mode 100644
index 0000000..924a48b
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductID
+{
+  #keys: '3[414382.0.440654928][414382.0.440654927][414382.0.440654929]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID0.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID0.qbl
new file mode 100644
index 0000000..a2af94e
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProductID0.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductID0
+{
+  #keys: '3[414382.0.440654946][414382.0.440654945][414382.0.440654947]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProfitabilityLevel.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProfitabilityLevel.qbl
new file mode 100644
index 0000000..ce076d7
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_ProfitabilityLevel.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProfitabilityLevel
+{
+  #keys: '3[414382.0.440654985][414382.0.440654984][414382.0.440654986]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Quantity.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Quantity.qbl
new file mode 100644
index 0000000..bcb4ab9
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_Quantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Quantity
+{
+  #keys: '3[414382.0.440654966][414382.0.440654965][414382.0.440654967]'
+  ValueType: Real
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_RewindsQuantityToReduced.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_RewindsQuantityToReduced.qbl
new file mode 100644
index 0000000..80f06ab
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_RewindsQuantityToReduced.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute RewindsQuantityToReduced
+{
+  #keys: '3[414382.0.440654956][414382.0.440654955][414382.0.440654957]'
+  ValueType: Real
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_SalesAmount.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_SalesAmount.qbl
new file mode 100644
index 0000000..1b25f3d
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_SalesAmount.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SalesAmount
+{
+  #keys: '3[414382.0.440654976][414382.0.440654975][414382.0.440654977]'
+  ValueType: Number
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_StockingPointID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_StockingPointID.qbl
new file mode 100644
index 0000000..b5cbcb8
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_StockingPointID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StockingPointID
+{
+  #keys: '3[414382.0.440730114][414382.0.440730113][414382.0.440730115]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_UnitOfMeasureName.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_UnitOfMeasureName.qbl
new file mode 100644
index 0000000..568e244
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_UnitOfMeasureName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UnitOfMeasureName
+{
+  #keys: '3[414382.0.440654973][414382.0.440654972][414382.0.440654974]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_VerNo.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_VerNo.qbl
new file mode 100644
index 0000000..a951c14
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/Attribute_VerNo.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute VerNo
+{
+  #keys: '3[414382.0.440654908][414382.0.440654907][414382.0.440654909]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_BusinessType.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_BusinessType.qbl
new file mode 100644
index 0000000..1672b03
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_BusinessType.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: BusinessType
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_Customer.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_Customer.qbl
new file mode 100644
index 0000000..e02a336
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_Customer.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: Customer
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_CustomerID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_CustomerID.qbl
new file mode 100644
index 0000000..66ae438
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_CustomerID.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: CustomerID
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_OrderType.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_OrderType.qbl
new file mode 100644
index 0000000..36871b8
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_OrderType.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: OrderType
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID.qbl
new file mode 100644
index 0000000..98649b2
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: ProductID
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID0.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID0.qbl
new file mode 100644
index 0000000..fcdd0b0
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_ProductID0.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: ProductID0
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_StockingPointID.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_StockingPointID.qbl
new file mode 100644
index 0000000..fbb83fc
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_StockingPointID.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: StockingPointID
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_UnitOfMeasureName.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_UnitOfMeasureName.qbl
new file mode 100644
index 0000000..b2012de
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_UnitOfMeasureName.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: UnitOfMeasureName
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_VerNo.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_VerNo.qbl
new file mode 100644
index 0000000..0edfadc
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/DefaultValue_VerNo.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+  TargetAttribute: VerNo
+}
diff --git a/_Main/BL/Type_HistoricalFillingCapacityOrder/_ROOT_Type_HistoricalFillingCapacityOrder.qbl b/_Main/BL/Type_HistoricalFillingCapacityOrder/_ROOT_Type_HistoricalFillingCapacityOrder.qbl
new file mode 100644
index 0000000..23855ad
--- /dev/null
+++ b/_Main/BL/Type_HistoricalFillingCapacityOrder/_ROOT_Type_HistoricalFillingCapacityOrder.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type HistoricalFillingCapacityOrder
+{
+  #keys: '5[414382.0.440654891][414382.0.440654889][0.0.0][414382.0.440654890][414382.0.440654892]'
+  BaseType: Object
+  StructuredName: 'HistoricalFillingCapacityOrders'
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def"
new file mode 100644
index 0000000..82df44f
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def"
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+Component ActionBarGroupSalesViews #extension
+{
+  Children:
+  [
+    Component ButtonSalesFillingCapacity
+    {
+      #keys: '[414382.0.436830247]'
+      BaseType: 'WebButton'
+      Children:
+      [
+        #child: ContextMenuSalesFillingCapacity
+      ]
+      Properties:
+      [
+        Image: 'BLOT'
+        Label: '濉骇'
+        Taborder: 3
+      ]
+    }
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageSales.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageSales.def
new file mode 100644
index 0000000..173d640
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageSales.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component ActionBarPageSales #extension
+{
+  Children:
+  [
+    #child: ActionBarGroupSalesViews
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuSalesFillingCapacity.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuSalesFillingCapacity.def
new file mode 100644
index 0000000..3dddc43
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuSalesFillingCapacity.def
@@ -0,0 +1,36 @@
+Quintiq file version 2.0
+Component ContextMenuSalesFillingCapacity
+{
+  #keys: '[414382.0.437003283]'
+  BaseType: 'WebContextMenu'
+  Children:
+  [
+    Component MenuSalesFillingCapacity
+    {
+      #keys: '[414382.0.437003284]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Image: 'ELEMENT_BLUE'
+        Taborder: 0
+        Title: 'Filling Capacity Scheme List'
+        Tooltip: 'Filling Capacity Scheme List'
+      ]
+    }
+    Component MenuSalesFillingSchemeDetail
+    {
+      #keys: '[414382.0.436840646]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Image: 'ELEMENT_ORANGE'
+        Taborder: 1
+        Title: '濉骇鍘嗗彶璁㈠崟鍒楄〃'
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingCapac.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingCapac.def
new file mode 100644
index 0000000..3aa17b6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingCapac.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: ContextMenuSalesFillingCapacity/MenuSalesFillingCapacity
+Response OnClick () id:Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingCapacity_OnClick
+{
+  #keys: '[414382.0.437390498]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebMenu_OnClick'
+  QuillAction
+  {
+    Body:
+    [*
+      // Open view
+      //ApplicationMacroPlanner.OpenView( 'Filling Capacity Scheme List',ButtonSalesFillingCapacity);
+      ApplicationMacroPlanner.OpenView( 'View Sales Segments', ButtonSalesFillingCapacity );
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingSchem.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingSchem.def
new file mode 100644
index 0000000..0fd125b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingSchem.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: ContextMenuSalesFillingCapacity/MenuSalesFillingSchemeDetail
+Response OnClick () id:Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingSchemeDetail_OnClick
+{
+  #keys: '[414382.0.439022595]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebMenu_OnClick'
+  QuillAction
+  {
+    Body:
+    [*
+      // Open view
+      //ApplicationMacroPlanner.OpenView( "FillingCapacitySchemeList",ButtonSalesFillingCapacity);
+      ApplicationMacroPlanner.OpenViewAndFocusButton( "FillingCapacitySchemeList");
+      //Application.OpenForm( "FormFillingScheme");
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
index 719ed35..075a217 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -10,6 +10,7 @@
       Children:
       [
         #child: ActionBarPageData
+        #child: ActionBarPageSales
       ]
     }
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def
index e71781f..6519f81 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def
@@ -11,9 +11,12 @@
     
     // OnOk
     this.ApplyChanges();
-    
     DataHolderFilling.Data().Commit();
     
+    fillingData := DataHolderFilling.Data();
+    
+    CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan, fillingData.WrappedInstance());
+    
     //if( not isnull( DataHolderForm.Data() ) )
     //{
     //  // Access the form, select the new assumption
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Response_pnlActions_btnOk_OnClick.def
index 9b30b93..ca39440 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Response_pnlActions_btnOk_OnClick.def
@@ -9,10 +9,7 @@
   {
     Body:
     [*
-      data := DataHolderFilling.Data();
-      
-      CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan,data);
-      Form.Close();
+      Form.ClickBtnOk();
     *]
   }
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/_ROOT_Component_DialogFillingCustomerAndForecast.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/_ROOT_Component_DialogFillingCustomerAndForecast.def
index fa9a6df..57c6988 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/_ROOT_Component_DialogFillingCustomerAndForecast.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/_ROOT_Component_DialogFillingCustomerAndForecast.def
@@ -23,7 +23,7 @@
     {
       #keys: '[414382.0.416323029]'
       BaseType: 'WebDataHolder'
-      Databinding: 'shadow[CustomerAndForecastOrder]*'
+      Databinding: 'shadow[FillingCapacityOrder]*'
       Properties:
       [
         Taborder: 3
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlActions.def
new file mode 100644
index 0000000..b759db3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlActions.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+Component pnlActions
+{
+  #keys: '[414382.0.423200498]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component btnOk
+    {
+      #keys: '[414382.0.423200502]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Label: 'Save'
+        Taborder: 0
+      ]
+    }
+    Component btnCancel
+    {
+      #keys: '[414382.0.423200504]'
+      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_DialogFillingOrderScheme/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlContent.def
new file mode 100644
index 0000000..b5e0e86
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Component_pnlContent.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+  #keys: '[414382.0.423200496]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component efSchemeName
+    {
+      #keys: '[414382.0.424860819]'
+      BaseType: 'WebEditField'
+      Properties:
+      [
+        Label: 'Scheme Name'
+        Taborder: 0
+      ]
+    }
+  ]
+  Properties:
+  [
+    Padding: 'true'
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Method_OpenScheme.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Method_OpenScheme.def
new file mode 100644
index 0000000..a48a494
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Method_OpenScheme.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#parent: #root
+Method OpenScheme () id:Method_DialogFillingOrderScheme_OpenScheme
+{
+  #keys: '[414382.0.424440675]'
+  Body:
+  [*
+    ApplicationMacroPlanner.ShowFormModal( this );
+  *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnCancel_OnClick.def
new file mode 100644
index 0000000..dbe627b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/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: '[414382.0.423200508]'
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      Form.Close();
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..855c43b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/Response_pnlActions_btnOk_OnClick.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnOk
+Response OnClick () id:Response_pnlActions_btnOk_OnClick
+{
+  #keys: '[414382.0.423200507]'
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      Form.ApplyChanges();
+      
+      schemeName := DialogFillingOrderScheme.efSchemeName().Text();
+      
+      FilllingCapacityOrderScheme::CreateFillingCapacityOrderScheme( MacroPlan,schemeName);
+      
+      Form.Close();
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/_ROOT_Component_DialogFillingOrderScheme.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/_ROOT_Component_DialogFillingOrderScheme.def
new file mode 100644
index 0000000..83e0bff
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingOrderScheme/_ROOT_Component_DialogFillingOrderScheme.def
@@ -0,0 +1,32 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogFillingOrderScheme
+{
+  #keys: '[414382.0.423200494]'
+  BaseType: 'WebForm'
+  Children:
+  [
+    #child: pnlContent
+    #child: pnlActions
+    Component DataHolderFillingScheme
+    {
+      #keys: '[414382.0.424891357]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'FillingCapacityOrder'
+      Properties:
+      [
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Alignment: 'trailing'
+    EnterButton: 'btnOk'
+    EscapeButton: 'btnCancel'
+    ExcludeFromActiveComponent: true
+    Padding: 'false'
+    Title: 'Save Scheme'
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Component_ListFillingCapacityOrder.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Component_ListFillingCapacityOrder.def
index 0f7e550..d951132 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Component_ListFillingCapacityOrder.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Component_ListFillingCapacityOrder.def
@@ -12,6 +12,7 @@
       Properties:
       [
         DataType: 'MacroPlan'
+        FixedFilter: 'not object.IsFilling()'
         Source: 'MacroPlan'
         Taborder: 0
         Transformation: 'FillingCapacityOrder'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_ListFillingCapacityOrder_MenuSaveScheme_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_ListFillingCapacityOrder_MenuSaveScheme_OnClick.def
index 23c2bed..0dd6b1d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_ListFillingCapacityOrder_MenuSaveScheme_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_ListFillingCapacityOrder_MenuSaveScheme_OnClick.def
@@ -11,8 +11,8 @@
   {
     Body:
     [*
-      form := construct( FormCustomerAndForecastOrder );
-      form.OpenScheme();
+      dlg := construct( DialogFillingOrderScheme );
+      dlg.OpenScheme();
       //dlg.Edit( selection);
     *]
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_ListFillingSchemeDetail.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_ListFillingSchemeDetail.def
new file mode 100644
index 0000000..9982fb6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_ListFillingSchemeDetail.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListFillingSchemeDetail
+{
+  #keys: '[414382.0.434111695]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractorFillingSchemeDetail
+    {
+      #keys: '[414382.0.434111696]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[FillingCapacityOrder]'
+        Source: 'DataHolderFillingSchemeDetails'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPageFillingSchemeDetail
+    Component DataSetLevelFillingSchemeDetail
+    {
+      #keys: '[414382.0.434111701]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenuFillingSchemeDetail
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"VerNo","title":"VerNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"VerNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}}]'
+        ContextMenu: 'listContextMenuFillingSchemeDetail'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listActionBarPageFillingSchemeDetail.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listActionBarPageFillingSchemeDetail.def
new file mode 100644
index 0000000..25791d7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listActionBarPageFillingSchemeDetail.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageFillingSchemeDetail
+{
+  #keys: '[414382.0.434111698]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listContextMenuFillingSchemeDetail.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listContextMenuFillingSchemeDetail.def
new file mode 100644
index 0000000..21ba05d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/Component_listContextMenuFillingSchemeDetail.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuFillingSchemeDetail
+{
+  #keys: '[414382.0.434111703]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/_ROOT_Component_FormFillingSchemeDetail\043802.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/_ROOT_Component_FormFillingSchemeDetail\043802.def"
new file mode 100644
index 0000000..39f6e98
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder802/_ROOT_Component_FormFillingSchemeDetail\043802.def"
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormFillingSchemeDetail
+{
+  #keys: '[414382.0.424331085]'
+  BaseType: 'WebForm'
+  Children:
+  [
+    #child: ListFillingSchemeDetail
+    Component DataHolderFillingSchemeDetails id:DataHolderFillingSchemeDetails_71
+    {
+      #keys: '[414382.0.438570912]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'structured[FillingCapacityOrder]*'
+      Children:
+      [
+        Component DataExtractorFillingSchemeDetails
+        {
+          #keys: '[414382.0.438691291]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'structured[FillingCapacityOrder]'
+            Source: 'FormFillingScheme.DataHolderFillingScheme'
+            Taborder: 0
+            Transformation: 'Elements'
+          ]
+        }
+      ]
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+  ]
+  Properties:
+  [
+    Title: 'Filling Capacity Orders'
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityScheme/Component_ListCustomerAndFillingCapacityOrder.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityScheme/Component_ListCustomerAndFillingCapacityOrder.def
index f0f2e59..529f05f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityScheme/Component_ListCustomerAndFillingCapacityOrder.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityScheme/Component_ListCustomerAndFillingCapacityOrder.def
@@ -5,6 +5,7 @@
   BaseType: 'WebList'
   Children:
   [
+    #child: listActionBarPageCustomerAndFillingCapacityOrder
     Component DataExtractorCustomerAndFillingCapacityOrder
     {
       #keys: '[414382.0.413740610]'
@@ -17,7 +18,6 @@
         Transformation: 'CustomerAndForecastOrder'
       ]
     }
-    #child: listActionBarPageCustomerAndFillingCapacityOrder
     Component DataSetLevelCustomerAndFillingCapacityOrder
     {
       #keys: '[414382.0.413740615]'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def
new file mode 100644
index 0000000..30b376c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def
@@ -0,0 +1,59 @@
+Quintiq file version 2.0
+Component ListFillingScheme
+{
+  #keys: '[414382.0.426811656]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractorFillingScheme
+    {
+      #keys: '[414382.0.426811657]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'MacroPlan'
+        Source: 'MacroPlan'
+        Taborder: 0
+        Transformation: 'FilllingCapacityOrderScheme'
+      ]
+    }
+    #child: listActionBarPageFillingScheme
+    Component DataSetLevelFillingScheme
+    {
+      #keys: '[414382.0.426811662]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: Menurelease
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SchemeName","title":"SchemeName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SchemeName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegmentName","title":"SalesSegmentName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SalesSegmentName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Customer","title":"Customer","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Customer"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SchemeDate","title":"SchemeDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SchemeDate"}}]'
+        ContextMenu: 'Menurelease'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+  ResponseDefinitions:
+  [
+    DelegatedResponseDefinition OnClick id:Responsedef_ListFillingScheme_WebMenu_OnClick
+    {
+      #keys: '[414382.0.428592707]'
+      Initiator: 'WebMenu'
+      IsInherited: false
+      ResponseType: 'OnClick'
+      Arguments:
+      [
+        ResponseDefinitionArgument selection
+        {
+          #keys: '[1143.0.45315951]'
+          Binding: 'this.Selection()'
+        }
+      ]
+    }
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_Menurelease.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_Menurelease.def
new file mode 100644
index 0000000..db68912
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_Menurelease.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+Component Menurelease
+{
+  #keys: '[414382.0.426811664]'
+  BaseType: 'listContextMenu'
+  Children:
+  [
+    Component MenuRelease
+    {
+      #keys: '[414382.0.428743342]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Taborder: 3
+        Title: 'Release'
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_listActionBarPageFillingScheme.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_listActionBarPageFillingScheme.def
new file mode 100644
index 0000000..14ace1f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_listActionBarPageFillingScheme.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageFillingScheme
+{
+  #keys: '[414382.0.426811659]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def
new file mode 100644
index 0000000..5d50bdf
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+#parent: ListFillingScheme
+Response OnClick (
+  FilllingCapacityOrderScheme selection
+) id:Response_ListFillingScheme_MenuRelease_OnClick
+{
+  #keys: '[414382.0.428592726]'
+  CanBindMultiple: false
+  DefinitionID => /ListFillingScheme/Responsedef_ListFillingScheme_WebMenu_OnClick
+  Initiator: 'MenuRelease'
+  Precondition:
+  [*
+    not selection.IsRelease();
+  *]
+  QuillAction
+  {
+    Body:
+    [*
+      selection.IsRelease(true);
+      FilllingCapacityOrderScheme::ReleaseFillingScheme( MacroPlan,selection);
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_OnClick.def
new file mode 100644
index 0000000..7b75d26
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_OnClick.def
@@ -0,0 +1,32 @@
+Quintiq file version 2.0
+#parent: ListFillingScheme
+Response OnClick (
+  FilllingCapacityOrderScheme selection
+) id:Response_ListFillingScheme_OnClick
+{
+  #keys: '[414382.0.426812119]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebList_OnClick'
+  QuillAction
+  {
+    Body:
+    [*
+      schemeName := selection.SchemeName();
+      info( "schemeName : " + schemeName );
+      list := selectset( MacroPlan,FillingCapacityOrder,order,order.SchemeName() = selection.SchemeName());
+      
+      traverse( list,Elements,e)
+      {
+          info( e.SchemeName() ); 
+      }
+      
+      DataHolderFillingScheme.Data(&list);
+      holderlist := DataHolderFillingScheme.Data();
+      traverse( holderlist,Elements,e)
+      {
+          info( e.SchemeName() ); 
+      }
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/_ROOT_Component_FormFillingScheme.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/_ROOT_Component_FormFillingScheme.def
new file mode 100644
index 0000000..b95b12f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/_ROOT_Component_FormFillingScheme.def
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormFillingScheme
+{
+  #keys: '[414382.0.426331772]'
+  BaseType: 'WebForm'
+  Children:
+  [
+    #child: ListFillingScheme
+    Component DataHolderFillingScheme
+    {
+      #keys: '[414382.0.437300526]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'structured[FillingCapacityOrder]*'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_ListHistoricalFillingCapacityOrder.def b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_ListHistoricalFillingCapacityOrder.def
new file mode 100644
index 0000000..017d092
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_ListHistoricalFillingCapacityOrder.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListHistoricalFillingCapacityOrder
+{
+  #keys: '[414382.0.442221219]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractorHistoricalFillingCapacityOrder
+    {
+      #keys: '[414382.0.442221220]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'MacroPlan'
+        Source: 'MacroPlan'
+        Taborder: 0
+        Transformation: 'HistoricalFillingCapacityOrder'
+      ]
+    }
+    #child: listActionBarPageHistoricalFillingCapacityOrder
+    Component DataSetLevelHistoricalFillingCapacityOrder
+    {
+      #keys: '[414382.0.442221225]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenuHistoricalFillingCapacityOrder
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"VerNo","title":"VerNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"VerNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderID","title":"OrderID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderType","title":"OrderType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FillingType","title":"FillingType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FillingType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Customer","title":"Customer","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Customer"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"RewindsQuantityToReduced","title":"RewindsQuantityToReduced","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"RewindsQuantityToReduced"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasureName","title":"UnitOfMeasureName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnitOfMeasureName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesAmount","title":"SalesAmount","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SalesAmount"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderDate","title":"OrderDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ForecastDemandDate","title":"ForecastDemandDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ForecastDemandDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProfitabilityLevel","title":"ProfitabilityLevel","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProfitabilityLevel"}}]'
+        ContextMenu: 'listContextMenuHistoricalFillingCapacityOrder'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listActionBarPageHistoricalFillingCapacityOrder.def b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listActionBarPageHistoricalFillingCapacityOrder.def
new file mode 100644
index 0000000..65995fb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listActionBarPageHistoricalFillingCapacityOrder.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageHistoricalFillingCapacityOrder
+{
+  #keys: '[414382.0.442221222]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listContextMenuHistoricalFillingCapacityOrder.def b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listContextMenuHistoricalFillingCapacityOrder.def
new file mode 100644
index 0000000..c1ee9a0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/Component_listContextMenuHistoricalFillingCapacityOrder.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuHistoricalFillingCapacityOrder
+{
+  #keys: '[414382.0.442221227]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/_ROOT_Component_FormHistoricalFillingCapacityOrder.def b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/_ROOT_Component_FormHistoricalFillingCapacityOrder.def
new file mode 100644
index 0000000..9a378bc
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormHistoricalFillingCapacityOrder/_ROOT_Component_FormHistoricalFillingCapacityOrder.def
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormHistoricalFillingCapacityOrder
+{
+  #keys: '[414382.0.441950653]'
+  BaseType: 'WebForm'
+  Children:
+  [
+    #child: ListHistoricalFillingCapacityOrder
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Views/\345\241\253\344\272\247\346\226\271\346\241\210\345\210\227\350\241\250.vw" "b/_Main/UI/MacroPlannerWebApp/Views/\345\241\253\344\272\247\346\226\271\346\241\210\345\210\227\350\241\250.vw"
new file mode 100644
index 0000000..da19691
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Views/\345\241\253\344\272\247\346\226\271\346\241\210\345\210\227\350\241\250.vw"
@@ -0,0 +1,194 @@
+Quintiq file version 2.0
+{
+  viewcontents
+  {
+    forms
+    {
+      form_FormFillingScheme
+      {
+        title: 'QTIANMA_JITUAN::FormFillingScheme'
+        shown: true
+        componentID: 'QTIANMA_JITUAN::FormFillingScheme'
+        layout
+        {
+          mode: 'open'
+          rowPosition: 1
+          rowSpan: 6
+          columnPosition: 1
+          columnSpan: 4
+        }
+        components
+        {
+          FormFillingScheme_ListFillingScheme
+          {
+          }
+          FormFillingScheme_DataSetLevelFillingScheme
+          {
+            groupDepth: -1
+            column_SchemeName
+            {
+              columnId: 'SchemeName'
+              dataPath: 'SchemeName'
+              dataType: 'string'
+              index: 0
+              subtotals: ''
+              width: 150
+            }
+            column_BusinessType
+            {
+              columnId: 'BusinessType'
+              dataPath: 'BusinessType'
+              dataType: 'string'
+              index: 1
+              subtotals: ''
+              width: 150
+            }
+            column_SalesSegmentName
+            {
+              columnId: 'SalesSegmentName'
+              dataPath: 'SalesSegmentName'
+              dataType: 'string'
+              index: 2
+              subtotals: ''
+              width: 150
+            }
+            column_Customer
+            {
+              columnId: 'Customer'
+              dataPath: 'Customer'
+              dataType: 'string'
+              index: 3
+              subtotals: ''
+              width: 150
+            }
+            column_SchemeDate
+            {
+              columnId: 'SchemeDate'
+              dataPath: 'SchemeDate'
+              dataType: 'date'
+              index: 4
+              subtotals: ''
+              width: 150
+            }
+          }
+        }
+      }
+      form_FormFillingSchemeDetail
+      {
+        title: 'QTIANMA_JITUAN::FormFillingSchemeDetail'
+        shown: true
+        componentID: 'QTIANMA_JITUAN::FormFillingSchemeDetail'
+        layout
+        {
+          mode: 'open'
+          rowPosition: 1
+          rowSpan: 6
+          columnPosition: 5
+          columnSpan: 4
+        }
+        components
+        {
+          FormFillingSchemeDetail_ListFillingSchemeDetail
+          {
+          }
+          FormFillingSchemeDetail_DataSetLevelFillingSchemeDetail
+          {
+            groupDepth: -1
+            column_VerNo
+            {
+              columnId: 'VerNo'
+              dataPath: 'VerNo'
+              dataType: 'string'
+              index: 0
+              subtotals: ''
+              width: 150
+            }
+            column_BusinessType
+            {
+              columnId: 'BusinessType'
+              dataPath: 'BusinessType'
+              dataType: 'string'
+              index: 1
+              subtotals: ''
+              width: 150
+            }
+          }
+        }
+      }
+      form_FormPriorities
+      {
+        title: 'Priorities'
+        shown: true
+        componentID: 'FormPriorities'
+        layout
+        {
+          mode: 'dockright'
+          index: 0
+        }
+        components
+        {
+          FormPriorities_ListPriority
+          {
+          }
+          FormPriorities_DataSetLevelPriority
+          {
+            groupDepth: -1
+            column_All_constraints
+            {
+              columnId: 'All constraints'
+              dataPath: 'All constraints'
+              dataType: 'string'
+              title: 'All constraints'
+              index: 0
+              subtotals: ''
+              width: 33
+            }
+            column_ImgHasSalesDemand
+            {
+              columnId: 'ImgHasSalesDemand'
+              dataPath: 'ImgHasSalesDemand'
+              dataType: 'string'
+              title: 'ImgHasSalesDemand'
+              index: 1
+              subtotals: ''
+              width: 30
+            }
+            column_Name
+            {
+              columnId: 'Name'
+              dataPath: 'Name'
+              dataType: 'string'
+              title: '鍚嶇О'
+              index: 2
+              subtotals: ''
+              width: 95
+            }
+            column_Weight
+            {
+              columnId: 'Weight'
+              dataPath: 'Weight'
+              dataType: 'real'
+              title: '鏉冮噸'
+              index: 3
+              subtotals: ''
+              width: 95
+            }
+          }
+        }
+      }
+    }
+    userconfigurableinformation
+    {
+    }
+    image: ''
+    page: ''
+    group: ''
+    index: 0
+    description: ''
+  }
+  formatversion: 2
+  id: '濉骇鏂规鍒楄〃'
+  name: 'FillingCapacitySchemeList'
+  isglobal: false
+  isroot: true
+}
diff --git "a/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/\345\241\253\344\272\247\346\226\271\346\241\210\345\210\227\350\241\250.vw" "b/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/\345\241\253\344\272\247\346\226\271\346\241\210\345\210\227\350\241\250.vw"
new file mode 100644
index 0000000..b90401b
--- /dev/null
+++ "b/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/\345\241\253\344\272\247\346\226\271\346\241\210\345\210\227\350\241\250.vw"
@@ -0,0 +1,11 @@
+Quintiq file version 2.0
+{
+  viewcontents
+  {
+  }
+  formatversion: 2
+  id: '濉骇鏂规鍒楄〃'
+  name: 'FillingCapacitySchemeList'
+  isglobal: false
+  isroot: false
+}

--
Gitblit v1.9.3