From c673b37d38537c136cd488b8430146573975d5e3 Mon Sep 17 00:00:00 2001
From: yanyuan <yuan.yan@capgemini.com>
Date: 星期三, 01 十一月 2023 14:28:59 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy
---
_Main/BL/Type_Global_MappingProduct_MP/Function_CalcCritical.qbl | 12
_Main/BL/Type_CapacityAndSaleBudgeCompareItemRow/StaticMethod_CreateIfNotExist.qbl | 6
_Main/BL/Type_Global_MappingProduct_MP/Attribute_KeyProduct.qbl | 5
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_pFilterCriteria_ButtonCapacityAndSaleBudgeChartTest_OnClick#603.def | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_SCustomOrder_FCOS_OnDataChanged.def | 25
_Main/BL/Type_S_DT_CustomOrder/Attribute_DerivedPriorityName.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderType.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_UnitOfMeasureName.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModify.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_EndDate.qbl | 7
_Main/BL/Type_S_DT_OrderSpliteRow/Attribute_NewAttribute.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityInDefaultUoM.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_ExpectedQuantity.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def | 41
_Main/BL/Type_Global_MAPISPIPCategory/Attribute_Critical.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesDemandConversionFactor.qbl | 7
_Main/BL/Type_S_DT_SpliteStruct/DefaultValue_Status.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_PriorityName.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/_ROOT_Component_FormCapacityAndSaleBudge.def | 23
_Main/BL/Type_S_DT_CustomOrder/_ROOT_Type_S_DT_CustomOrder.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_lisplitedetails#450.def | 42
_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityPerDay.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonExportCompare_OnClick#325.def | 6
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsValidData.qbl | 7
_Main/BL/Relations/Relation_S_FunctionClass_MacroPlan_MacroPlan_S_FunctionClass.qbl | 23
_Main/BL/Type_S_DT_SpliteStruct/Attribute_Qty.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_Panel651_btn_delete_FCOV_OnClick.def | 22
_var/_Main/ModelSettings/Common/Dev-25/_ROOT_Role_Dev-25.properties | 46
_Main/BL/Type_CapacityAndSaleBudgeFilterBusinessType/StaticMethod_InitializedData.qbl | 18
_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID_S_DT_CustomOrder.qbl | 8
_Main/UI/MacroPlannerWebApp/Views/年度产销复盘.vw | 562 +------
_Main/BL/Type_S_DT_CustomOrder/Attribute_DefaultUOMConversionFactor#413.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_StockingPointID.qbl | 7
_Main/BL/Type_GlobalDTOTable/Method_InitTestDataByYear.qbl | 49
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsPostponed.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductGrade.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteRenmain.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_ListSDIP.def | 14
_Main/BL/Type_CapacityAndSaleBudgeFilterPlaceOfProductionOfArray/StaticMethod_InitializedData.qbl | 18
_Main/BL/Type_S_DT_SpliteStruct/Attribute_ForecastDate.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/_ROOT_Component_FrmCustomOrderSpliteRow.def | 102 +
_Main/BL/Relations/Relation_S_DT_SpliteStruct_MacroPlan_MacroPlan_S_DT_SpliteStruct.qbl | 23
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsEligibleForNetting.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_Function_FCOV.def | 114 +
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_listOrders_635_OnSelectionChanged.def | 18
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsSoftDeleted.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_LastModify.qbl | 6
_Main/BL/Type_S_DT_CustomOrder/Attribute_PISPConversionFactor.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu199#1.def | 10
_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_S_DT_CustomOrder_S_DT_CustomOrder_S_DT_OrderSpl.qbl | 23
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPI.qbl | 7
_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTopMost.def | 20
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def | 22
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderType.qbl | 6
_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl | 247 ++-
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonGenerateTestData_OnClick#19.def | 26
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ActionBarGroupScenarioComparisonViews_ButtonAnnualPro.def | 20
_var/_Main/ModelSettings/Common/Dev-27/_ROOT_Role_Dev-27.properties | 46
_Main/BL/Type_S_DT_SpliteStruct/Attribute_SpliteReason.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageScenarioComparison.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSDIP.def | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listOrders#635.def | 54
_Main/BL/Type_CapacityAndSaleBudgeCompareItemColumn/Attribute_TotalIdentification.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLeaf.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModifyTime.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserCh#171.def | 4
_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeChart.qbl | 93
_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl | 7
_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/_ROOT_Component_frmStandardAnalysis633.def | 19
_Main/BL/Type_S_DT_CustomOrder/Attribute_SegmentPriority.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/DeclarativeTypeIndexRelation_CalcChild.qbl | 16
_Main/BL/Type_S_FunctionClass/_ROOT_Type_S_FunctionClass.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel651.def | 44
_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTop.def | 29
_Main/BL/Type_S_DT_CustomOrder/Attribute_BusinessType.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsManuallyConfigured.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_HasValidConversionFactor.qbl | 7
_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def | 2
_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_InitializedData.qbl | 15
_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMDataRouting.qbl | 16
_Main/BL/Type_S_DT_SpliteStruct/Attribute_OrderID.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserChecke.def | 6
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_OperateBtns_FCOS.def | 16
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu655#1.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_pFilterCriteria.def | 60
_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesSegmentName.qbl | 7
_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_MacroPlan_MacroPlan_S_DT_OrderSpliteRow.qbl | 23
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPIUser.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_SplitCount.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_HasPostponedSalesDemand.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_OK_FCOS_OnClick.def | 38
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_ProductGrade.qbl | 6
_Main/BL/Type_S_DT_CustomOrder/Attribute_CurrencyID.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listActionBarPage229#1.def | 10
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/_ROOT_Component_FrmCustomOrderView.def | 19
_Main/BL/Type_S_DT_CustomOrder/Attribute_FulfilledQuantity.qbl | 7
_Main/BL/Type_Global_MappingProduct_MP/Attribute_Critical.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SegmentPriority.qbl | 6
_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderLineID.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Response_TIANMA_JITUAN_ListSalesDemands_MenuSpliteOrder_OnClick.def | 22
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsFirmed.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_ChartCapacityAndSaleBudgeChart.def | 2
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick.def | 40
_Main/BL/Type_PriorityResult/StaticMethod_CalculateScore.qbl | 40
_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderID.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataTotalViolationCount.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_BusinessType.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_pButton.def | 37
_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTag.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_spliteDetails.def | 26
_Main/BL/Type_S_DT_CustomOrder/Attribute_PriceUoM.qbl | 7
_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_InitializedData.qbl | 16
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def | 2
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_sendERP_FCOV_OnClick.def | 16
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonExportDetail_OnClick#971.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_pButton.def | 48
_Main/BL/Relations/Relation_S_DT_CustomOrder_MacroPlan_MacroPlan_S_DT_CustomOrder.qbl | 23
_Main/BL/Type_S_DT_CustomOrder/Attribute_Variance.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_list_SpliteDetails#136.def | 61
_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerName.qbl | 7
_Main/BL/Type_S_DT_SpliteStruct/_ROOT_Type_S_DT_SpliteStruct.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_FCOS_OnDataChanged.def | 23
_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductID.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonCapacityAndSaleBudgeCompare_OnClick#231.def | 12
_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteReason.qbl | 8
_Main/BL/Relations/Relation_S_DT_CustomOrder_Child_S_DT_CustomOrder_Parent.qbl | 23
_Main/BL/Type_S_DT_CustomOrder/Attribute_SheetProfitability.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_function_FCOS_btn_add_FCOS_OnClick.def | 32
_Main/BL/Type_S_DT_CustomOrder/Attribute_OutsideOfPlanningHorizonQuantity.qbl | 7
_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID.qbl | 9
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_Cancel_FCOS_OnClick.def | 41
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SheetProfitability.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick.def | 36
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_splitRow_FCOV_OnClick.def | 25
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_MatrixEditorCapacityAndSaleBudgeCompare.def | 2
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_splite_info.def | 50
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLocked.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_Panel700.def | 39
_Main/BL/Type_S_DT_CustomOrder/Attribute_StartDate.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_ID_SpliteStruct.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 1
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_DataView.def | 16
_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerPolicy.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_IsAvailable.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_function_FCOS.def | 41
_Main/BL/Type_S_DT_CustomOrder/Attribute_Price.qbl | 7
_Main/BL/Type_S_FunctionClass/StaticMethod_SM_OrderToSpliteOrder.qbl | 207 ++
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_ListCapacityAndSaleBudge.def | 5
_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSalesDemands.def | 1
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_list_SpliteDetails_136_m_delete_list_SD_OnClick.def | 37
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews#859.def | 18
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def | 53
_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_listContextMenuSD.def | 22
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel713.def | 26
_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_InitializedData.qbl | 19
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderTag.qbl | 6
_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevere.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_Status_Splite.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_DemandUncertaintyPercentage.qbl | 7
_Main/BL/Type_S_DT_OrderSpliteRow/_ROOT_Type_S_DT_OrderSpliteRow.qbl | 10
_Main/BL/Type_S_DT_SpliteStruct/Attribute_Status.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage243#1.def | 10
_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerID.qbl | 8
_Main/BL/Type_S_DT_CustomOrder/Attribute_Quantity.qbl | 7
_var/_Main/ModelSettings/Common/Dev-23/_ROOT_Role_Dev-23.properties | 46
_Main/BL/Type_Global_MAPISPIPCategory/Function_CalcCritical.qbl | 13
/dev/null | 205 --
_Main/BL/Type_S_DT_CustomOrder/Attribute_ID.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listContextMenu950#1.def | 25
_Main/BL/Type_S_DT_CustomOrder/DefaultValue_CustomerPolicy.qbl | 6
_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevereCount.qbl | 7
_Main/BL/Type_S_DT_CustomOrder/Attribute_ParentID.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_splite_info_btn_splite_add_OnClick.def | 51
_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTime.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage978#1.def | 10
_Main/BL/Type_S_DT_CustomOrder/TypeIndex_PrimaryKey_ID.qbl | 12
176 files changed, 3,121 insertions(+), 1,021 deletions(-)
diff --git a/_Main/BL/Relations/Relation_S_DT_CustomOrder_Child_S_DT_CustomOrder_Parent.qbl b/_Main/BL/Relations/Relation_S_DT_CustomOrder_Child_S_DT_CustomOrder_Parent.qbl
new file mode 100644
index 0000000..ba14057
--- /dev/null
+++ b/_Main/BL/Relations/Relation_S_DT_CustomOrder_Child_S_DT_CustomOrder_Parent.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation S_DT_CustomOrder_Child_S_DT_CustomOrder_Parent
+{
+ #keys: '1[414724.0.301487674]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide Child
+ {
+ #keys: '3[414724.0.301487676][414724.0.301487675][414724.0.301487677]'
+ Cardinality: '0to1'
+ ObjectDefinition: S_DT_CustomOrder
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide Parent
+ {
+ #keys: '3[414724.0.301487679][414724.0.301487678][414724.0.301487680]'
+ Cardinality: '1toN'
+ ObjectDefinition: S_DT_CustomOrder
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_S_DT_CustomOrder_MacroPlan_MacroPlan_S_DT_CustomOrder.qbl b/_Main/BL/Relations/Relation_S_DT_CustomOrder_MacroPlan_MacroPlan_S_DT_CustomOrder.qbl
new file mode 100644
index 0000000..1060e96
--- /dev/null
+++ b/_Main/BL/Relations/Relation_S_DT_CustomOrder_MacroPlan_MacroPlan_S_DT_CustomOrder.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation S_DT_CustomOrder_MacroPlan_MacroPlan_S_DT_CustomOrder
+{
+ #keys: '1[414724.0.292616032]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[414724.0.292616034][414724.0.292616033][414724.0.292616035]'
+ Cardinality: '0to1'
+ ObjectDefinition: S_DT_CustomOrder
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide S_DT_CustomOrder
+ {
+ #keys: '3[414724.0.292616037][414724.0.292616036][414724.0.292616038]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_MacroPlan_MacroPlan_S_DT_OrderSpliteRow.qbl b/_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_MacroPlan_MacroPlan_S_DT_OrderSpliteRow.qbl
new file mode 100644
index 0000000..101f476
--- /dev/null
+++ b/_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_MacroPlan_MacroPlan_S_DT_OrderSpliteRow.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation S_DT_OrderSpliteRow_MacroPlan_MacroPlan_S_DT_OrderSpliteRow
+{
+ #keys: '1[414724.0.289871273]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[414724.0.289871275][414724.0.289871274][414724.0.289871276]'
+ Cardinality: '0to1'
+ ObjectDefinition: S_DT_OrderSpliteRow
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide S_DT_OrderSpliteRow
+ {
+ #keys: '3[414724.0.289871278][414724.0.289871277][414724.0.289871279]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_S_DT_CustomOrder_S_DT_CustomOrder_S_DT_OrderSpl.qbl b/_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_S_DT_CustomOrder_S_DT_CustomOrder_S_DT_OrderSpl.qbl
new file mode 100644
index 0000000..673ec22
--- /dev/null
+++ b/_Main/BL/Relations/Relation_S_DT_OrderSpliteRow_S_DT_CustomOrder_S_DT_CustomOrder_S_DT_OrderSpl.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation S_DT_OrderSpliteRow_S_DT_CustomOrder_S_DT_CustomOrder_S_DT_OrderSpliteRow
+{
+ #keys: '1[414724.0.292600485]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide S_DT_CustomOrder
+ {
+ #keys: '3[414724.0.292600487][414724.0.292600486][414724.0.292600488]'
+ Cardinality: '0to1'
+ ObjectDefinition: S_DT_OrderSpliteRow
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide S_DT_OrderSpliteRow
+ {
+ #keys: '3[414724.0.292600490][414724.0.292600489][414724.0.292600491]'
+ Cardinality: '1toN'
+ ObjectDefinition: S_DT_CustomOrder
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_S_DT_SpliteStruct_MacroPlan_MacroPlan_S_DT_SpliteStruct.qbl b/_Main/BL/Relations/Relation_S_DT_SpliteStruct_MacroPlan_MacroPlan_S_DT_SpliteStruct.qbl
new file mode 100644
index 0000000..71e9ae6
--- /dev/null
+++ b/_Main/BL/Relations/Relation_S_DT_SpliteStruct_MacroPlan_MacroPlan_S_DT_SpliteStruct.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation S_DT_SpliteStruct_MacroPlan_MacroPlan_S_DT_SpliteStruct
+{
+ #keys: '1[414724.0.291485612]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[414724.0.291485614][414724.0.291485613][414724.0.291485615]'
+ Cardinality: '0to1'
+ ObjectDefinition: S_DT_SpliteStruct
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide S_DT_SpliteStruct
+ {
+ #keys: '3[414724.0.291485617][414724.0.291485616][414724.0.291485618]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_S_FunctionClass_MacroPlan_MacroPlan_S_FunctionClass.qbl b/_Main/BL/Relations/Relation_S_FunctionClass_MacroPlan_MacroPlan_S_FunctionClass.qbl
new file mode 100644
index 0000000..01a5c7d
--- /dev/null
+++ b/_Main/BL/Relations/Relation_S_FunctionClass_MacroPlan_MacroPlan_S_FunctionClass.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation S_FunctionClass_MacroPlan_MacroPlan_S_FunctionClass
+{
+ #keys: '1[414724.0.288796777]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[414724.0.288796779][414724.0.288796778][414724.0.288796780]'
+ Cardinality: '0to1'
+ ObjectDefinition: S_FunctionClass
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide S_FunctionClass
+ {
+ #keys: '3[414724.0.288796782][414724.0.288796781][414724.0.288796783]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeCompareItemColumn/Attribute_TotalIdentification.qbl b/_Main/BL/Type_CapacityAndSaleBudgeCompareItemColumn/Attribute_TotalIdentification.qbl
new file mode 100644
index 0000000..c116037
--- /dev/null
+++ b/_Main/BL/Type_CapacityAndSaleBudgeCompareItemColumn/Attribute_TotalIdentification.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute TotalIdentification
+{
+ #keys: '3[414702.1.286051925][414702.1.286051924][414702.1.286051926]'
+ Description: '鏍囪瘑浣嶏紙鍒ゆ柇鏄惁鍔犲拰锛�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeCompareItemRow/StaticMethod_CreateIfNotExist.qbl b/_Main/BL/Type_CapacityAndSaleBudgeCompareItemRow/StaticMethod_CreateIfNotExist.qbl
index 230f93e..3b19661 100644
--- a/_Main/BL/Type_CapacityAndSaleBudgeCompareItemRow/StaticMethod_CreateIfNotExist.qbl
+++ b/_Main/BL/Type_CapacityAndSaleBudgeCompareItemRow/StaticMethod_CreateIfNotExist.qbl
@@ -10,9 +10,11 @@
[*
// yypsybs Sep-18-2023 (created)
value := select( parent, CapacityAndSaleBudgeCompareItemRow, row, row.BusinessType() = businessType and row.PlaceOfProductionOfArray() = placeOfProductionOfArray );
- if( isnull( value ) ) {
+
+ if ( isnull( value ) ) {
value := parent.CapacityAndSaleBudgeCompareItemRow( relnew, BusinessType := businessType, PlaceOfProductionOfArray := placeOfProductionOfArray );
- }
+ }
+
return value;
*]
}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterBusinessType/StaticMethod_InitializedData.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterBusinessType/StaticMethod_InitializedData.qbl
new file mode 100644
index 0000000..a41d703
--- /dev/null
+++ b/_Main/BL/Type_CapacityAndSaleBudgeFilterBusinessType/StaticMethod_InitializedData.qbl
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitializedData (
+ GlobalOTDSOP globalOTDSOP,
+ const GlobalOTDTable globalOTDTable
+)
+{
+ TextBody:
+ [*
+ globalOTDSOP.CapacityAndSaleBudgeFilterBusinessType( relflush );
+
+ businessTypes := selectuniquevalues( globalOTDTable, Global_MappingProduct_MP, tempGMPMP, true, tempGMPMP.BusinessType() );
+
+ traverse ( businessTypes, Elements, bt ) {
+ globalOTDSOP.CapacityAndSaleBudgeFilterBusinessType( relnew, BusinessType := bt );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_Initial.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_Initial.qbl
deleted file mode 100644
index 3601509..0000000
--- a/_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_Initial.qbl
+++ /dev/null
@@ -1,14 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod Initial (
- GlobalOTDSOP parent
-)
-{
- Description: '鍒濆鍖栧姣旈」'
- TextBody:
- [*
- // yypsybs Sep-15-2023 (created)
- CapacityAndSaleBudgeFilterItem::CreateIfNotExist( parent, "闈㈡澘鍒嗛厤閲�" );
- CapacityAndSaleBudgeFilterItem::CreateIfNotExist( parent, "閿�鍞" );
- *]
-}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_InitializedData.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_InitializedData.qbl
new file mode 100644
index 0000000..c9a019d
--- /dev/null
+++ b/_Main/BL/Type_CapacityAndSaleBudgeFilterItem/StaticMethod_InitializedData.qbl
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitializedData (
+ GlobalOTDSOP globalOTDSOP
+)
+{
+ Description: '鍒濆鍖栧姣旈」'
+ TextBody:
+ [*
+ globalOTDSOP.CapacityAndSaleBudgeFilterItem( relflush );
+
+ globalOTDSOP.CapacityAndSaleBudgeFilterItem( relnew, ItemName := "闈㈡澘鍒嗛厤閲�" );
+ globalOTDSOP.CapacityAndSaleBudgeFilterItem( relnew, ItemName := "閿�鍞" );
+ *]
+}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_Initial.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_Initial.qbl
deleted file mode 100644
index 8159900..0000000
--- a/_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_Initial.qbl
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod Initial (
- GlobalOTDSOP parent
-)
-{
- Description: '鍒濆鍖栧勾浠�'
- TextBody:
- [*
- // yypsybs Sep-15-2023 (created)
- existList := selectuniquevalues( parent, CapacityAndSaleBudgeFilterMonth, item, item.MonthNo() );
- for( i := 1; i <= 12; i++ ) {
- if( existList.Find( i ) = -1 ) {
- parent.CapacityAndSaleBudgeFilterMonth( relnew,
- MonthNo := i );
- }
- }
- *]
-}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_InitializedData.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_InitializedData.qbl
new file mode 100644
index 0000000..b85464a
--- /dev/null
+++ b/_Main/BL/Type_CapacityAndSaleBudgeFilterMonth/StaticMethod_InitializedData.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitializedData (
+ GlobalOTDSOP globalOTDSOP
+)
+{
+ Description: '鍒濆鍖栧勾浠�'
+ TextBody:
+ [*
+ globalOTDSOP.CapacityAndSaleBudgeFilterMonth( relflush );
+
+ for( i := 1; i <= 12; i++ ) {
+ globalOTDSOP.CapacityAndSaleBudgeFilterMonth( relnew, MonthNo := i );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterPlaceOfProductionOfArray/StaticMethod_InitializedData.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterPlaceOfProductionOfArray/StaticMethod_InitializedData.qbl
new file mode 100644
index 0000000..3c65d07
--- /dev/null
+++ b/_Main/BL/Type_CapacityAndSaleBudgeFilterPlaceOfProductionOfArray/StaticMethod_InitializedData.qbl
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitializedData (
+ GlobalOTDSOP globalOTDSOP,
+ const GlobalOTDTable globalOTDTable
+)
+{
+ TextBody:
+ [*
+ globalOTDSOP.CapacityAndSaleBudgeFilterPlaceOfProductionOfArray( relflush );
+
+ organCodes := selectuniquevalues( globalOTDTable, Global_MappingOperation, tempGMO, true, tempGMO.OrganCode() );
+
+ traverse ( organCodes, Elements, oc ) {
+ globalOTDSOP.CapacityAndSaleBudgeFilterPlaceOfProductionOfArray( relnew, PlaceOfProductionOfArray := oc );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_Initial.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_Initial.qbl
deleted file mode 100644
index 72badb3..0000000
--- a/_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_Initial.qbl
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod Initial (
- GlobalOTDSOP parent
-)
-{
- Description: '鍒濆鍖栧勾浠�'
- TextBody:
- [*
- // yypsybs Sep-15-2023 (created)
- existList := selectuniquevalues( parent, CapacityAndSaleBudgeFilterYear, item, item.YearNo() );
- nowYear := Date::Today().Year();
- for( i := nowYear - 10; i <= nowYear + 5; i++ ) {
- if( existList.Find( i ) = -1 ) {
- parent.CapacityAndSaleBudgeFilterYear( relnew,
- YearNo := i );
- }
- }
- *]
-}
diff --git a/_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_InitializedData.qbl b/_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_InitializedData.qbl
new file mode 100644
index 0000000..a76216a
--- /dev/null
+++ b/_Main/BL/Type_CapacityAndSaleBudgeFilterYear/StaticMethod_InitializedData.qbl
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitializedData (
+ GlobalOTDSOP globalOTDSOP
+)
+{
+ Description: '鍒濆鍖栧勾浠�'
+ TextBody:
+ [*
+ // yypsybs Sep-15-2023 (created)
+ globalOTDSOP.CapacityAndSaleBudgeFilterYear( relflush );
+
+ nowYear := Date::Today().Year();
+
+ for( i := nowYear - 10; i <= nowYear + 5; i++ ) {
+ globalOTDSOP.CapacityAndSaleBudgeFilterYear( relnew, YearNo := i );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_GlobalDTOTable/Method_InitTestDataByYear.qbl b/_Main/BL/Type_GlobalDTOTable/Method_InitTestDataByYear.qbl
index c84f323..98dddf0 100644
--- a/_Main/BL/Type_GlobalDTOTable/Method_InitTestDataByYear.qbl
+++ b/_Main/BL/Type_GlobalDTOTable/Method_InitTestDataByYear.qbl
@@ -2,28 +2,45 @@
#parent: #root
Method InitTestDataByYear (
MacroPlan macroPlan,
- CapacityAndSaleBudgeFilterYears years
+ GlobalOTDSOP globalOTDSOP,
+ CapacityAndSaleBudgeFilterYears years,
+ CapacityAndSaleBudgeFilterBusinessTypes businessTypes,
+ CapacityAndSaleBudgeFilterPlaceOfProductionOfArrays placeOfProductionOfArrays,
+ Product_MPs product_MPs
)
{
TextBody:
[*
- // yypsybs Oct-7-2023 (created)
- productCodeList := selectuniquevalues( macroPlan, Product_MP, item, item.ID() );
- debuginfo( "productCodeList : " + [String]productCodeList.Size() );
+ product_MPs := selectset( product_MPs, Elements, tempPMP, tempPMP.IsLeaf() and not tempPMP.IsSystem() );
this.Global_MappingAnnualBudgetData( relflush );
- debuginfo( "create Global_MappingAnnualBudgetData test data" );
- id := 1;
- traverse( years, Elements, year ) {
- for( i := 1; i <= productCodeList.Size(); i := i + 1 ) {
- productCode := productCodeList.Element( i - 1 );
+
+ if ( years.Size() = 0 ) {
+ years := selectset( globalOTDSOP, CapacityAndSaleBudgeFilterYear, tempCASBFY,
+ tempCASBFY.YearNo() = Date::ActualDate().Year() or
+ tempCASBFY.YearNo() = Date::ActualDate().Year() - 1 or
+ tempCASBFY.YearNo() = Date::ActualDate().Year() + 1
+ );
+ }
+ if ( businessTypes.Size() = 0 ) {
+ businessTypes := selectset( globalOTDSOP, CapacityAndSaleBudgeFilterBusinessType, tempCASBFBT, true );
+ }
+ if ( placeOfProductionOfArrays.Size() = 0 ) {
+ placeOfProductionOfArrays := selectset( globalOTDSOP, CapacityAndSaleBudgeFilterPlaceOfProductionOfArray, tempCASBFPOPOA, true );
+ }
+
+ traverse ( years, Elements, year ) {
+ traverse ( product_MPs, Elements, pmp ) {
+ businessType := businessTypes.Element( Number::Random( 0, businessTypes.Size() - 1 ) ).BusinessType();
+ placeOfProductionOfArray := placeOfProductionOfArrays.Element( Number::Random( 0, placeOfProductionOfArrays.Size() - 1 ) ).PlaceOfProductionOfArray();
mappingAnnualBudget := this.Global_MappingAnnualBudgetData( relnew,
- ID := [String]id,
- YearNo := [String]year.YearNo(),
- BusinessType := "浜嬩笟閮�" + [String](productCode.Length() mod 3),
- OrganCode := "I13",
- ProductID := productCode);
- id := id + 1;
+ ID := OS::GenerateGUIDAsString(),
+ YearNo := [String]year.YearNo(),
+ BusinessType := businessType,
+ OrganCode := placeOfProductionOfArray,
+ ProductID := pmp.ID()
+ );
+
mappingAnnualBudget.MonthlyModCapacity1( [String]Real::Random( 20000.0, 30000.0 ) );
mappingAnnualBudget.MonthlyModCapacity2( [String]Real::Random( 20000.0, 30000.0 ) );
mappingAnnualBudget.MonthlyModCapacity3( [String]Real::Random( 20000.0, 30000.0 ) );
@@ -62,7 +79,5 @@
mappingAnnualBudget.MonthlySales12( [String]Real::Random( 20000.0, 30000.0 ) );
}
}
- result2 := selectset( this, Global_MappingAnnualBudgetData, item, true );
- debuginfo( "test MappingAnnualBudget size : " + [String]result2.Size() );
*]
}
diff --git a/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeChart.qbl b/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeChart.qbl
index f860d1f..b96a8a8 100644
--- a/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeChart.qbl
+++ b/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeChart.qbl
@@ -15,73 +15,47 @@
Description: '鎸夊叆鍙傚鐞嗘暟鎹紝浜х敓闇�瑕佺殑CapacityAndSaleBudgeChartElement'
TextBody:
[*
- // yypsybs Sep-19-2023 (created)
- // true, false
- //info( saleOrCapacity );
- // 鏈�;瀛ｅ害;鍗婂勾;骞�
- //info( groupBy );
- // 闈㈡澘鍩哄湴;浜嬩笟閮�
- //info( byBusinessTypeOrByOrgCode );
- //traverse( businessTypes, Elements, businessType ) {
- // info( "businessType : " + businessType.BusinessType() );
- //}
- //traverse( placeOfProductionOfArrays, Elements, placeOfProductionOfArray ) {
- // info( "placeOfProductionOfArray : " + placeOfProductionOfArray.PlaceOfProductionOfArray() );
- //}
- //traverse( macroPlans, Elements, macroPlan ) {
- // info( "macroPlan : " + macroPlan.ScenarioName() );
- //}
+ info( "浜ц兘/閿�鍞锛�", saleOrCapacity, " 鏃堕棿鍒嗙粍锛�", groupBy, " 鍩哄湴/浜嬩笟閮細", byBusinessTypeOrByOrgCode );
// 骞翠唤涓嶉�夋椂鍏ㄩ��
- if( years.Size() = 0 ) {
- years := selectsortedset( this, CapacityAndSaleBudgeFilterYear, item, true, item.YearNo() );
+ if ( years.Size() = 0 ) {
+ years := selectset( this, CapacityAndSaleBudgeFilterYear, tempCASBFY, tempCASBFY.YearNo() = Date::ActualDate().Year() );
}
- //traverse( years, Elements, year ) {
- // debuginfo( "yearNo : " + [String]year.YearNo() );
- //}
// 鏈堜唤涓嶉�夋椂鍏ㄩ��
- if( months.Size() = 0 ) {
+ if ( months.Size() = 0 ) {
months := selectsortedset( this, CapacityAndSaleBudgeFilterMonth, item, true, item.MonthNo() );
}
- //traverse( months, Elements, month ) {
- // debuginfo( "monthNo : " + [String]month.MonthNo() );
- //}
// ====娓呯悊鏃ф暟鎹�====
this.CapacityAndSaleBudgeChartRow( relflush );
this.CapacityAndSaleBudgeChartElement( relflush );
// ====鎸夐潰鏉垮熀鍦板拰浜嬩笟閮ㄥ浜у搧杩涜绛涢�夊垎缁�====
- historyData := selectset( otdTable, Global_MappingAnnualBudgetData, item, true );
- if( businessTypes.Size() > 0 ) {
+ targeGlobal_MappingAnnualBudgetDatas := selectset( otdTable, Global_MappingAnnualBudgetData, tempGMABD, true );
+ if ( businessTypes.Size() > 0 ) {
businessTypeStrings := selectuniquevalues( businessTypes, Elements, item, true, item.BusinessType() );
- historyData := selectset( historyData, Elements, item, businessTypeStrings.Find( item.BusinessType() ) > -1 );
+ targeGlobal_MappingAnnualBudgetDatas := selectset( targeGlobal_MappingAnnualBudgetDatas, Elements, item, businessTypeStrings.Find( item.BusinessType() ) > -1 );
}
- if( placeOfProductionOfArrays.Size() > 0 ) {
+ if ( placeOfProductionOfArrays.Size() > 0 ) {
placeOfProductionOfArrayStrings := selectuniquevalues( placeOfProductionOfArrays, Elements, item, true, item.PlaceOfProductionOfArray() );
- historyData := selectset( historyData, Elements, item, placeOfProductionOfArrayStrings.Find( item.OrgCodeFromBom() ) > -1 );
+ targeGlobal_MappingAnnualBudgetDatas := selectset( targeGlobal_MappingAnnualBudgetDatas, Elements, item, placeOfProductionOfArrayStrings.Find( item.OrganCode() ) > -1 );
}
- //info( "historyData : " + [String]historyData.Size() );
- traverse( historyData, Elements, item ) {
- row := CapacityAndSaleBudgeChartRow::CreateIfNotExist( this, item.BusinessType(), item.OrgCodeFromBom() );
+ info( "閫変腑鐨勪釜鏁�:", targeGlobal_MappingAnnualBudgetDatas.Size() );
+
+ traverse ( targeGlobal_MappingAnnualBudgetDatas, Elements, gmabd ) {
+ row := CapacityAndSaleBudgeChartRow::CreateIfNotExist( this, gmabd.BusinessType(), gmabd.OrganCode() );
// 璁板綍姣忚鍖呭惈鍝簺product
- CapacityAndSaleBudgeChartRowProduct::CreateIfNotExist( row, item.ProductID() );
+ CapacityAndSaleBudgeChartRowProduct::CreateIfNotExist( row, gmabd.ProductID() );
}
+
rows := selectset( this, CapacityAndSaleBudgeChartRow, item, true );
- //info( "rows : " + [String]rows.Size() );
- placeOfProductionOfArrayList := selectuniquevalues( historyData, Elements, item, item.OrgCodeFromBom() );
- //traverse( placeOfProductionOfArrayList, Elements, item ) {
- // info( "placeOfProduction : " + item );
- //}
- businessTypeList := selectuniquevalues( historyData, Elements, item, item.BusinessType() );
- //traverse( businessTypeList, Elements, item ) {
- // info( "businessType : " + item );
- //}
+ placeOfProductionOfArrayList := selectuniquevalues( targeGlobal_MappingAnnualBudgetDatas, Elements, tempGMABD, tempGMABD.OrganCode() );
+ businessTypeList := selectuniquevalues( targeGlobal_MappingAnnualBudgetDatas, Elements, tempGMABD, tempGMABD.BusinessType() );
+
// 鐢熸垚鍥捐〃鍏冪礌
- traverse( years, Elements, year ) {
- // debuginfo( "process year start : " + [String]year.YearNo() );
- if( byBusinessTypeOrByOrgCode = "闈㈡澘鍩哄湴" and groupBy = "骞�" ) {
+ traverse ( years, Elements, year ) {
+ if ( byBusinessTypeOrByOrgCode = "闈㈡澘鍩哄湴" and groupBy = "骞�" ) {
// 鐩爣
- traverse( placeOfProductionOfArrayList, Elements, placeOfProductionOfArray ) {
+ traverse ( placeOfProductionOfArrayList, Elements, placeOfProductionOfArray ) {
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByPlaceOfProductionOfArray( rows, placeOfProductionOfArray );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year.YearNo() + "骞�-鐩爣",
@@ -89,9 +63,9 @@
Quantity := ifexpr( saleOrCapacity = "閿�鍞",
Global_MappingAnnualBudgetData::GetSaleByYear( productCodeList, otdTable, year.YearNo() ),
Global_MappingForecast::GetQuantityByYear( productCodeList, otdTable, year.YearNo() ) )
- );
+ );
// S&OP
- traverse( macroPlans, Elements, macroPlan ) {
+ traverse ( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year.YearNo() + "骞�-" + macroPlan.ScenarioName(),
BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
@@ -286,17 +260,16 @@
// debuginfo( "process month end : " + [String]month.MonthNo() );
}
}
- // debuginfo( "process year end : " + [String]year.YearNo() )
}
- //info( "CapacityAndSaleBudgeChartElement : " + [String]selectset( this, CapacityAndSaleBudgeChartElement, item, true ).Size() );
- //traverse( this, CapacityAndSaleBudgeChartRow, row ) {
- // info( "==鈫�==" );
- // info( row.BusinessType() );
- // info( row.PlaceOfProductionOfArray() );
- // elements := selectset( row, CapacityAndSaleBudgeChartRowProduct, cell, true );
- // info( elements.Size() );
- // info( row.GetProductCodes().Concatenate( " | " ) );
- // info( "==鈫�==" );
- //}
+ ////info( "CapacityAndSaleBudgeChartElement : " + [String]selectset( this, CapacityAndSaleBudgeChartElement, item, true ).Size() );
+ ////traverse( this, CapacityAndSaleBudgeChartRow, row ) {
+ //// info( "==鈫�==" );
+ //// info( row.BusinessType() );
+ //// info( row.PlaceOfProductionOfArray() );
+ //// elements := selectset( row, CapacityAndSaleBudgeChartRowProduct, cell, true );
+ //// info( elements.Size() );
+ //// info( row.GetProductCodes().Concatenate( " | " ) );
+ //// info( "==鈫�==" );
+ ////}
*]
}
diff --git a/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl b/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl
index 64a208a..0ba67ec 100644
--- a/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl
+++ b/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl
@@ -11,35 +11,22 @@
Description: 'todo : mappingParent鏀逛负mpSync, random鍒犱簡'
TextBody:
[*
- // yypsybs Sep-18-2023 (created)
// ====涓嶉�夋椂榛樿鍏ㄩ��====
- if( years.Size() = 0 ) {
- years := selectsortedset( this, CapacityAndSaleBudgeFilterYear, item, item.YearNo() );
+ if ( years.Size() = 0 ) {
+ years := selectset( this, CapacityAndSaleBudgeFilterYear, tempCASBFY, tempCASBFY.YearNo() = Date::ActualDate().Year() );
}
- if( months.Size() = 0 ) {
+ if ( months.Size() = 0 ) {
months := selectsortedset( this, CapacityAndSaleBudgeFilterMonth, item, item.MonthNo() );
}
- traverse( macroPlans, Elements, item ) {
- debuginfo( "scenario : " + item.ScenarioName() );
- }
- traverse( items, Elements, item ) {
- debuginfo( "item : " + item.ItemName() );
- }
- traverse( years, Elements, item ) {
- debuginfo( "year : " + [String]item.YearNo() );
- }
- traverse( months, Elements, item ) {
- debuginfo( "month : " + [String]item.MonthNo() );
- }
- // ====娓呯悊鏃ф暟鎹�====
+
this.CapacityAndSaleBudgeCompareItemRow( relflush );
this.CapacityAndSaleBudgeCompareItemColumn( relflush );
- // ====姹囨�绘墍鏈夊嚭鐜扮殑浜у搧====
- historyData := selectset( otdTable, Global_MappingAnnualBudgetData, item, true );
- debuginfo( "historyData : " + [String]historyData.Size() );
- traverse( historyData, Elements, one ) {
- productCode := one.ProductID();
+ // ====姹囨�绘墍鏈夊嚭鐜扮殑浜у搧====
+ targetglobal_MappingAnnualBudgetData := selectset( otdTable, Global_MappingAnnualBudgetData, item, true );
+
+ traverse ( targetglobal_MappingAnnualBudgetData, Elements, gmabd ) {
+ productCode := gmabd.ProductID();
// Global_MappingOperationBOM::CreateTestData( otdTable, "浜嬩笟閮�" + [String](productCode.Length() mod 3), "闈㈡澘鍩哄湴" + [String](productCode.Length() mod 4), productCode );
// boms := selectset( otdTable, Global_MappingOperationBOM, bom, bom.ProductCode() = productCode );
// if( boms.Size() > 0 ) {
@@ -47,17 +34,16 @@
// businessType := bom.BusinessType();
// placeOfProductionOfArray := bom.OrganCode();
// 鐩稿悓闈㈡澘鍩哄湴鍜屼簨涓氶儴鐨勬斁涓�琛�
- row := CapacityAndSaleBudgeCompareItemRow::CreateIfNotExist( this, one.BusinessType(), one.OrgCodeFromBom() );
+ row := CapacityAndSaleBudgeCompareItemRow::CreateIfNotExist( this, gmabd.BusinessType(), gmabd.OrganCode() );
// 璁板綍姣忚鍖呭惈鍝簺product
CapacityAndSaleBudgeCompareItemRowProduct::CreateIfNotExist( row, productCode );
// } else {
// debuginfo( "no boms for product : " + productCode );
// }
}
- debuginfo( "CapacityAndSaleBudgeCompareItemRow : " + [String]selectset( this, CapacityAndSaleBudgeCompareItemRow, item, true ).Size() );
+
// ====浠庡乏鍚戝彸鐢熸垚鍒楀ご涓庡唴瀹�====
// 浜嬩笟閮紝闈㈡澘鍩哄湴
- debuginfo( "dealing businessType and placeOfProductionOfArray" )
columnBusinessType := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "浜嬩笟閮�" );
columnPlaceOfProductionOfArray := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍩哄湴" );
traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
@@ -66,100 +52,159 @@
cell := columnPlaceOfProductionOfArray.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := row.PlaceOfProductionOfArray() );
cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
}
+
// 闈㈡澘鍒嗛厤閲� - 骞村害棰勭畻 (sheets)
// 鏍煎紡锛� 闈㈡澘鍒嗛厤閲� - 骞� - 鏈堬紙1-12 & total锛� - 骞村害棰勭畻/scenarioName
- debuginfo( "dealing 闈㈡澘鍒嗛厤閲�" )
- if( CapacityAndSaleBudgeFilterItem::Contains( items, "闈㈡澘鍒嗛厤閲�" ) ) {
- traverse( years, Elements, year ) {
- debuginfo( "闈㈡澘鍒嗛厤閲�" + [String]year.YearNo() + "骞�" );
+ if ( CapacityAndSaleBudgeFilterItem::Contains( items, "闈㈡澘鍒嗛厤閲�" ) ) {
+ traverse ( years, Elements, year ) {
// 鍘嗗彶鏁版嵁
- debuginfo( "闈㈡澘鍒嗛厤閲�" + [String]year.YearNo() + "骞村巻鍙叉暟鎹�" );
- traverse( months, Elements, month ) {
- columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-骞村害棰勭畻" );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Global_MappingForecast::GetQuantityByMonth( row.GetProductCodes(), otdTable, DateTime::Now().Year(), month.MonthNo() );
- cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // traverse ( months, Elements, month ) {
+ // columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-骞村害棰勭畻" );
+ // traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Global_MappingForecast::GetQuantityByMonth( row.GetProductCodes(), otdTable, DateTime::Now().Year(), month.MonthNo() );
+ // cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ // }
+ // columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-total-骞村害棰勭畻" );
+ // traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Global_MappingForecast::GetQuantityByYear( row.GetProductCodes(), otdTable, year.YearNo() );
+ // cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, casbcir ) {
+ total := 0.0;
+ traverse ( months, Elements, m ) {
+ columnName := "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-" + [String]m.MonthNo() + "鏈�-骞村害棰勭畻";
+ columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, columnName );
+ cellReal := Global_MappingForecast::GetQuantityByMonth( casbcir.GetProductCodes(), otdTable, DateTime::Now().Year(), m.MonthNo() );
+ cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ total := total + cellReal;
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
+ columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-total-骞村害棰勭畻" );
+ cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]total );
+ columnYear.TotalIdentification( year.YearNo() );
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
- columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-total-骞村害棰勭畻" );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Global_MappingForecast::GetQuantityByYear( row.GetProductCodes(), otdTable, year.YearNo() );
- cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
- }
- debuginfo( "闈㈡澘鍒嗛厤閲�" + [String]year.YearNo() + "骞碨&OP鏁版嵁" );
+
// S&OP鏁版嵁
- traverse( macroPlans, Elements, macroPlan ) {
- traverse( months, Elements, month ) {
- columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this,
- "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-" + macroPlan.ScenarioName() );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Product_MP::GetNewSupplyByMonth( row.GetProductCodes(), macroPlan, year.YearNo(), month.MonthNo() );
- cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // traverse ( macroPlans, Elements, macroPlan ) {
+ // traverse ( months, Elements, month ) {
+ // columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this,
+ // "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-" + macroPlan.ScenarioName() );
+ // traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Product_MP::GetNewSupplyByMonth( row.GetProductCodes(), macroPlan, year.YearNo(), month.MonthNo() );
+ // cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ // }
+ // columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this,
+ // "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-total-" + macroPlan.ScenarioName() );
+ // traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Product_MP::GetNewSupplyByYear( row.GetProductCodes(), macroPlan, year.YearNo() );
+ // cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ // }
+ traverse ( macroPlans, Elements, mp ) {
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, casbcir ) {
+ total := 0.0;
+ traverse ( months, Elements, m ) {
+ columnName := "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-" + [String]m.MonthNo() + "鏈�-" + mp.ScenarioName();
+ columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, columnName );
+ cellReal := Product_MP::GetNewSupplyByMonth( casbcir.GetProductCodes(), mp, year.YearNo(), m.MonthNo() );
+ cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ total := total + cellReal;
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
- }
- columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this,
- "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-total-" + macroPlan.ScenarioName() );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Product_MP::GetNewSupplyByYear( row.GetProductCodes(), macroPlan, year.YearNo() );
- cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "闈㈡澘鍒嗛厤閲�-" + [String]year.YearNo() + "骞�-total-" + mp.ScenarioName() );
+ cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]total );
+ columnYear.TotalIdentification( year.YearNo() );
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
}
}
}
+
// 骞村害閿�鍞
- debuginfo( "dealing 閿�鍞" )
- if( CapacityAndSaleBudgeFilterItem::Contains( items, "閿�鍞" ) ) {
- traverse( years, Elements, year ) {
- debuginfo( "閿�鍞" + [String]year.YearNo() + "骞�" );
+ if ( CapacityAndSaleBudgeFilterItem::Contains( items, "閿�鍞" ) ) {
+ traverse ( years, Elements, year ) {
// 鍘嗗彶鏁版嵁
- debuginfo( "閿�鍞" + [String]year.YearNo() + "骞村巻鍙叉暟鎹�" );
- traverse( months, Elements, month ) {
- columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-骞村害棰勭畻" );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Global_MappingAnnualBudgetData::GetSaleByMonth( row.GetProductCodes(), otdTable, year.YearNo(), month.MonthNo() );
- cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // traverse ( months, Elements, month ) {
+ // columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-骞村害棰勭畻" );
+ // traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Global_MappingAnnualBudgetData::GetSaleByMonth( row.GetProductCodes(), otdTable, year.YearNo(), month.MonthNo() );
+ // cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ // }
+ // columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-骞村害棰勭畻" );
+ // traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Global_MappingAnnualBudgetData::GetSaleByYear( row.GetProductCodes(), otdTable, year.YearNo() );
+ // cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, casbcir ) {
+ total := 0.0;
+ traverse ( months, Elements, m ) {
+ columnName := "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-" + [String]m.MonthNo() + "鏈�-骞村害棰勭畻";
+ columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, columnName );
+ cellReal := Global_MappingAnnualBudgetData::GetSaleByMonth( casbcir.GetProductCodes(), otdTable, year.YearNo(), m.MonthNo() );
+ cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ total := total + cellReal;
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
+ columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-total-骞村害棰勭畻" );
+ cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]total );
+ columnYear.TotalIdentification( year.YearNo() );
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
- columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-骞村害棰勭畻" );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Global_MappingAnnualBudgetData::GetSaleByYear( row.GetProductCodes(), otdTable, year.YearNo() );
- cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
- }
- debuginfo( "閿�鍞" + [String]year.YearNo() + "骞村巻鍙叉暟鎹甋&OP鏁版嵁" );
+
// S&OP鏁版嵁
- traverse( macroPlans, Elements, macroPlan ) {
- traverse( months, Elements, month ) {
- columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-" + macroPlan.ScenarioName() );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- cellReal := Forecast::GetFulfilledBalanceByMonth( row.GetProductCodes(), macroPlan, year.YearNo(), month.MonthNo() );
- cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // traverse ( macroPlans, Elements, macroPlan ) {
+ // traverse ( months, Elements, month ) {
+ // columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-" + [String]month.MonthNo() + "鏈�-" + macroPlan.ScenarioName() );
+ // traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // cellReal := Forecast::GetFulfilledBalanceByMonth( row.GetProductCodes(), macroPlan, year.YearNo(), month.MonthNo() );
+ // cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ // }
+ // columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-total-" + macroPlan.ScenarioName() );
+ // traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ // // QID 23
+ // cellReal := Forecast::GetFulfilledBalanceByYear( row.GetProductCodes(), macroPlan, year.YearNo() );
+ // cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ // cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ // }
+ // }
+ traverse ( macroPlans, Elements, mp ) {
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, casbcir ) {
+ total := 0.0;
+ traverse ( months, Elements, m ) {
+ columnName := "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-" + [String]m.MonthNo() + "鏈�-" + mp.ScenarioName();
+ columnMonth := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, columnName );
+ cellReal := Forecast::GetFulfilledBalanceByMonth( casbcir.GetProductCodes(), mp, year.YearNo(), m.MonthNo() );
+ cell := columnMonth.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
+ total := total + cellReal;
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
- }
- columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-total-" + macroPlan.ScenarioName() );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- // QID 23
- cellReal := Forecast::GetFulfilledBalanceByYear( row.GetProductCodes(), macroPlan, year.YearNo() );
- cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]cellReal );
- cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
+ columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "瀵瑰閿�鍞-" + [String]year.YearNo() + "骞�-total-" + mp.ScenarioName() );
+ cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]total );
+ columnYear.TotalIdentification( year.YearNo() );
+ cell.CapacityAndSaleBudgeCompareItemRow( relset, casbcir );
}
}
}
}
+
// 澶у紶鐩堝埄棰�
- debuginfo( "dealing 澶у紶鐩堝埄棰�" )
- traverse( years, Elements, year ) {
+ traverse ( years, Elements, year ) {
// 鍘嗗彶鏁版嵁
columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "澶у紶鐩堝埄棰�-" + [String]year.YearNo() + "骞�-骞村害棰勭畻" );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- // todo
- // QID 23
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]Number::Random( 0, 0 ) );
cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
}
@@ -173,19 +218,17 @@
}
}
// 浜у搧鐩堝埄棰�
- debuginfo( "dealing 浜у搧鐩堝埄棰�" )
- traverse( years, Elements, year ) {
+ traverse ( years, Elements, year ) {
// 鍘嗗彶鏁版嵁
columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "浜у搧鐩堝埄棰�-" + [String]year.YearNo() + "骞�-骞村害棰勭畻" );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
- // todo
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]Number::Random( 0, 0 ) );
cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
}
// S&OP鏁版嵁
- traverse( macroPlans, Elements, macroPlan ) {
+ traverse ( macroPlans, Elements, macroPlan ) {
columnYear := CapacityAndSaleBudgeCompareItemColumn::CreateIfNotExist( this, "浜у搧鐩堝埄棰�-" + [String]year.YearNo() + "骞�-" + macroPlan.ScenarioName() );
- traverse( this, CapacityAndSaleBudgeCompareItemRow, row ) {
+ traverse ( this, CapacityAndSaleBudgeCompareItemRow, row ) {
// todo
cell := columnYear.CapacityAndSaleBudgeCompareItemCell( relnew, CellContent := [String]Number::Random( 0, 0 ) );
cell.CapacityAndSaleBudgeCompareItemRow( relset, row );
@@ -194,7 +237,6 @@
}
// 璁剧疆rowNo鍜宑olumnNo
- debuginfo( "set rowNo and columnNo" );
rowNo := 1;
rowSorted := selectsortedset( this, CapacityAndSaleBudgeCompareItemRow, item, item.PlaceOfProductionOfArray() + "_" + item.BusinessType() );
traverse( rowSorted, Elements, item ) {
@@ -206,6 +248,5 @@
item.ColumnNo( columnNo );
columnNo := columnNo + 1;
}
- debuginfo( "done" );
*]
}
diff --git a/_Main/BL/Type_Global_MAPISPIPCategory/Attribute_Critical.qbl b/_Main/BL/Type_Global_MAPISPIPCategory/Attribute_Critical.qbl
new file mode 100644
index 0000000..d8e681a
--- /dev/null
+++ b/_Main/BL/Type_Global_MAPISPIPCategory/Attribute_Critical.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Critical
+{
+ #keys: '3[414882.0.72610025][414882.0.72610024][414882.0.72610026]'
+ Description: '鍏抽敭鐗╂枡'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_Global_MAPISPIPCategory/Function_CalcCritical.qbl b/_Main/BL/Type_Global_MAPISPIPCategory/Function_CalcCritical.qbl
new file mode 100644
index 0000000..a6a025e
--- /dev/null
+++ b/_Main/BL/Type_Global_MAPISPIPCategory/Function_CalcCritical.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcCritical
+{
+ TextBody:
+ [*
+ // hongjli Oct-24-2023 (created)
+
+ value := guard( select( this, Global_MappingProduct_MP, tempGMPMP, true ).Critical(), false );
+
+ this.Critical(value);
+ *]
+}
diff --git a/_Main/BL/Type_Global_MappingProduct_MP/Attribute_Critical.qbl b/_Main/BL/Type_Global_MappingProduct_MP/Attribute_Critical.qbl
new file mode 100644
index 0000000..bdc96fd
--- /dev/null
+++ b/_Main/BL/Type_Global_MappingProduct_MP/Attribute_Critical.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Critical
+{
+ #keys: '3[414882.0.72574612][414882.0.72574611][414882.0.72574613]'
+ Description: '鍏抽敭鐗╂枡'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_Global_MappingProduct_MP/Attribute_KeyProduct.qbl b/_Main/BL/Type_Global_MappingProduct_MP/Attribute_KeyProduct.qbl
index 431f730..3824133 100644
--- a/_Main/BL/Type_Global_MappingProduct_MP/Attribute_KeyProduct.qbl
+++ b/_Main/BL/Type_Global_MappingProduct_MP/Attribute_KeyProduct.qbl
@@ -3,5 +3,10 @@
Attribute KeyProduct
{
#keys: '3[414702.0.247711010][414702.0.247711009][414702.0.247711011]'
+ Description:
+ [*
+ 宸插純鐢�
+ 鍏抽敭鐗╂枡娌℃湁鏁版嵁鏉ユ簮锛屼互鍚庝粠鍏朵粬灞炴�ц绠楀緱鍒帮紝鏀逛负Critical
+ *]
ValueType: Boolean
}
diff --git a/_Main/BL/Type_Global_MappingProduct_MP/Function_CalcCritical.qbl b/_Main/BL/Type_Global_MappingProduct_MP/Function_CalcCritical.qbl
new file mode 100644
index 0000000..be05486
--- /dev/null
+++ b/_Main/BL/Type_Global_MappingProduct_MP/Function_CalcCritical.qbl
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcCritical
+{
+ TextBody:
+ [*
+ // renhao Oct-30-2023 (created)
+ value := this.ProductMajorType()="鎴愬搧" or this.ProductMajorType()="鍗婃垚鍝�";
+
+ this.Critical(value);
+ *]
+}
diff --git a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl
index 4c98455..7140c64 100644
--- a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl
@@ -36,10 +36,11 @@
info( "Now is dealing with the " + count.AsQUILL() + "ActualPISPIP " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" );
}
//product := select( globalOTDTable,Global_MappingProduct_MP,product,product.ID() = actual.ProductID() and product.KeyProduct() = nuclear,true);
- if( /*not isnull( product*/ guard( actual.Global_MAPISPIPCategory().KeyProduct() = nuclear, false ) ){
+ //if( guard( actual.Global_MAPISPIPCategory().KeyProduct() = nuclear, false ) ){
+ if( not nuclear or (nuclear and actual.Global_MAPISPIPCategory().Critical() = nuclear) ){
if( not isnull(businessTypes)){
- for( i :=0 ;i < businessTypes.Size();i++ ){
+
//businessType := businessTypes.Element( i );
if( /*product.BusinessType() = businessType and not product.IsCommon()*/ not actual.Global_MAPISPIPCategory().IsCommon() ){
ActualProductInStockingPointInPeriod::CreateOrUpdate( this,
@@ -49,7 +50,7 @@
actual.ActualInventoryLevelEnd(),
actual.ManufacturedDate());
}
- }
+
}else{
ActualProductInStockingPointInPeriod::CreateOrUpdate( this,
diff --git a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMDataRouting.qbl b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMDataRouting.qbl
index 43f35a0..b575592 100644
--- a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMDataRouting.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMDataRouting.qbl
@@ -65,8 +65,11 @@
true, trash );
mainBOM.Quantity( firstAlterRow.UnitUsageOfComponents() / firstAlterRow.ComponentOutputRate() );
mainBOM.MaxQuantityInGroup( firstAlterRow.UnitUsageOfComponents() / firstAlterRow.ComponentOutputRate() );
+ mainBOM.MinQuantityInGroup(0);
mainQty := mainBOM.Quantity();
Transaction::Transaction().Propagate();
+
+ altersize := alterRows.Size();
// 娣诲姞杈呮枡
traverse( alterRows, Elements, alterRow ) {
alterProd := Product_MP::FindById( this, alterRow.AlternativeMaterialCode() );
@@ -84,14 +87,23 @@
trash := construct( OperationBOMs );
if( not isnull( mainInput ) ) {
alterBom := mainInput.Operation().LinkPISP( pispAlter, true, mainInput.OperationLinkGroupID(), trash );
- alterBom.Quantity( mainBOM.MaxQuantityInGroup() * alterRow.AlternativeRate() );
+ //alterBom.Quantity( mainBOM.MaxQuantityInGroup() * alterRow.AlternativeRate() );
+ //alterBom.MaxQuantityInGroup( mainBOM.MaxQuantityInGroup() );
+ alterBom.Quantity( mainBOM.MaxQuantityInGroup() / altersize );
alterBom.MaxQuantityInGroup( mainBOM.MaxQuantityInGroup() );
+ alterBom.MinQuantityInGroup(0);
// info( "Quantity" + [String]alterBom.Quantity() )
// info( "MaxQuantityInGroup" + [String]alterBom.MaxQuantityInGroup() )
mainQty := mainQty - alterBom.Quantity();
}
}
- mainBOM.Quantity( mainQty );
+
+ Transaction::Transaction().Propagate( relation( OperationBOM, OperationInputGroup));
+ if( not isnull( mainBOM.OperationInputGroup())){
+ mainBOM.OperationInputGroup().InputGroupQuantity(mainBOM.MaxQuantityInGroup());
+ mainBOM.Quantity( mainBOM.MaxQuantityInGroup() / altersize );
+ }
+
}
}
}
diff --git a/_Main/BL/Type_PriorityResult/StaticMethod_CalculateScore.qbl b/_Main/BL/Type_PriorityResult/StaticMethod_CalculateScore.qbl
index 09624f6..9794c76 100644
--- a/_Main/BL/Type_PriorityResult/StaticMethod_CalculateScore.qbl
+++ b/_Main/BL/Type_PriorityResult/StaticMethod_CalculateScore.qbl
@@ -16,53 +16,42 @@
score := 0.0;
remindFormula := formula;
-
// 閬嶅巻浼樺厛绾у洜瀛愰厤缃�
- if( not remindFormula = '' )
- {
+ if( not remindFormula = '' ){
// 浠庤捣濮嬩綅缃紑濮嬪尮閰�
- if(remindFormula.StartsWith( "+" ))
- {
+ if(remindFormula.StartsWith( "+" )){
remindFormula := remindFormula.SubString( 1,remindFormula.Length()-1);
score := PriorityResult::GetDetailsValue( customerOrder,remindFormula,macroPlan,globalOTDTable);
score := lastScore + score;
-
+
// 鎴彇鎺夊凡缁忚绠楃殑浼樺厛绾у洜瀛� 閫掑綊璁＄畻
remindFormula := PriorityResult::GetRemindFormula( remindFormula,macroPlan);
- PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
- }
- else if( remindFormula.StartsWith( "-" ))
- {
+ score := score + PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
+ }else if( remindFormula.StartsWith( "-" )){
remindFormula := remindFormula.SubString( 1,remindFormula.Length()-1);
score := PriorityResult::GetDetailsValue( customerOrder,remindFormula,macroPlan,globalOTDTable);
score := lastScore - score;
// 鎴彇鎺夊凡缁忚绠楃殑浼樺厛绾у洜瀛� 閫掑綊璁＄畻
remindFormula := PriorityResult::GetRemindFormula( remindFormula,macroPlan);
- PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
- }
- else if( remindFormula.StartsWith( "*" ) )
- {
+ score := score + PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
+ }else if( remindFormula.StartsWith( "*" ) ){
remindFormula := remindFormula.SubString( 1,remindFormula.Length()-1);
score := PriorityResult::GetDetailsValue( customerOrder,remindFormula,macroPlan,globalOTDTable);
score := lastScore * score;
// 鎴彇鎺夊凡缁忚绠楃殑浼樺厛绾у洜瀛� 閫掑綊璁＄畻
remindFormula := PriorityResult::GetRemindFormula( remindFormula,macroPlan);
- PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
- }
- else if( remindFormula.StartsWith( "/" ) )
- {
+ score := score + PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
+ }else if( remindFormula.StartsWith( "/" ) ){
remindFormula := remindFormula.SubString( 1,remindFormula.Length()-1);
score := PriorityResult::GetDetailsValue( customerOrder,remindFormula,macroPlan,globalOTDTable);
score := lastScore / score;
// 鎴彇鎺夊凡缁忚绠楃殑浼樺厛绾у洜瀛� 閫掑綊璁＄畻
remindFormula := PriorityResult::GetRemindFormula( remindFormula,macroPlan);
- PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
- }
- else if( remindFormula.StartsWith( "(" ) )
- {
+ score := score + PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
+ }else if( remindFormula.StartsWith( "(" ) ){
// 鎵惧埌绗竴涓粨鏉熺殑 )
// 璁＄畻鎷彿涓殑鍐呭
rightBracket := remindFormula.FindString( ")",0);
@@ -71,17 +60,14 @@
// 鎴彇 ) 鍚庣殑瀛楃缁х画杩涜璁＄畻
remindFormula := remindFormula.SubString( rightBracket,remindFormula.Length()-1);
- }
- else
- {
+ }else{
// 涓嶆槸绗﹀彿 鐩存帴鑾峰彇璁＄畻鍚庣殑鏁板��
score := PriorityResult::GetDetailsValue( customerOrder,remindFormula,macroPlan,globalOTDTable);
// 鎴彇鎺夊凡缁忚绠楃殑浼樺厛绾у洜瀛� 閫掑綊璁＄畻
remindFormula := PriorityResult::GetRemindFormula( remindFormula,macroPlan);
- PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
+ score := PriorityResult::CalculateScore( remindFormula,customerOrder,businessType,macroPlan,score,globalOTDTable);
}
}
-
// 娌℃湁鍖归厤 鍏紡璁＄畻瀹屾垚
return score;
*]
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_BusinessType.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_BusinessType.qbl
new file mode 100644
index 0000000..9acd896
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_BusinessType.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute BusinessType
+{
+ #keys: '3[414724.0.292616049][414724.0.292616048][414724.0.292616050]'
+ Description: '浜嬩笟閮�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_CurrencyID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CurrencyID.qbl
new file mode 100644
index 0000000..f1af9aa
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CurrencyID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CurrencyID
+{
+ #keys: '3[414724.0.292600064][414724.0.292600063][414724.0.292600065]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerID.qbl
new file mode 100644
index 0000000..5134f1f
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CustomerID
+{
+ #keys: '3[414724.0.292600051][414724.0.292600050][414724.0.292600052]'
+ Description: 'CustomerID'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerName.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerName.qbl
new file mode 100644
index 0000000..48816ad
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CustomerName
+{
+ #keys: '3[414724.0.292600074][414724.0.292600073][414724.0.292600075]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerPolicy.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerPolicy.qbl
new file mode 100644
index 0000000..26d9c89
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_CustomerPolicy.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CustomerPolicy
+{
+ #keys: '3[414724.0.292600039][414724.0.292600038][414724.0.292600040]'
+ Description: '瀹㈡埛绛栫暐'
+ ValueType: String
+}
diff --git "a/_Main/BL/Type_S_DT_CustomOrder/Attribute_DefaultUOMConversionFactor\043413.qbl" "b/_Main/BL/Type_S_DT_CustomOrder/Attribute_DefaultUOMConversionFactor\043413.qbl"
new file mode 100644
index 0000000..9c7b50f
--- /dev/null
+++ "b/_Main/BL/Type_S_DT_CustomOrder/Attribute_DefaultUOMConversionFactor\043413.qbl"
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DefaultUOMConversionFactor
+{
+ #keys: '3[414724.0.292600084][414724.0.292600083][414724.0.292600085]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_DemandUncertaintyPercentage.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_DemandUncertaintyPercentage.qbl
new file mode 100644
index 0000000..fa27856
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_DemandUncertaintyPercentage.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DemandUncertaintyPercentage
+{
+ #keys: '3[414724.0.292600099][414724.0.292600098][414724.0.292600100]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_DerivedPriorityName.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_DerivedPriorityName.qbl
new file mode 100644
index 0000000..7aa9f83
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_DerivedPriorityName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DerivedPriorityName
+{
+ #keys: '3[414724.0.292600109][414724.0.292600108][414724.0.292600110]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_EndDate.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_EndDate.qbl
new file mode 100644
index 0000000..a67ffa2
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_EndDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[414724.0.292600119][414724.0.292600118][414724.0.292600120]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_ExpectedQuantity.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ExpectedQuantity.qbl
new file mode 100644
index 0000000..cf35ed4
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ExpectedQuantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ExpectedQuantity
+{
+ #keys: '3[414724.0.292600129][414724.0.292600128][414724.0.292600130]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_FulfilledQuantity.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_FulfilledQuantity.qbl
new file mode 100644
index 0000000..7ab421a
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_FulfilledQuantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute FulfilledQuantity
+{
+ #keys: '3[414724.0.292600139][414724.0.292600138][414724.0.292600140]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_HasPostponedSalesDemand.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_HasPostponedSalesDemand.qbl
new file mode 100644
index 0000000..0ff7b63
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_HasPostponedSalesDemand.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute HasPostponedSalesDemand
+{
+ #keys: '3[414724.0.292600152][414724.0.292600151][414724.0.292600153]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_HasValidConversionFactor.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_HasValidConversionFactor.qbl
new file mode 100644
index 0000000..99402a6
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_HasValidConversionFactor.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute HasValidConversionFactor
+{
+ #keys: '3[414724.0.292600162][414724.0.292600161][414724.0.292600163]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_ID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ID.qbl
new file mode 100644
index 0000000..2c6851c
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ID
+{
+ #keys: '3[414724.0.292600172][414724.0.292600171][414724.0.292600173]'
+ IsReadOnly: true
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_ID_SpliteStruct.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ID_SpliteStruct.qbl
new file mode 100644
index 0000000..a963e1d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ID_SpliteStruct.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ID_SpliteStruct
+{
+ #keys: '3[414724.0.314769076][414724.0.314769075][414724.0.314769077]'
+ Description: 'S_DT_SpliteStruct琛↖D'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsAvailable.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsAvailable.qbl
new file mode 100644
index 0000000..26d302c
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsAvailable.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsAvailable
+{
+ #keys: '3[414724.0.292600045][414724.0.292600044][414724.0.292600046]'
+ Description: '璁㈠崟鏄惁鍙備笌璁″垝'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsEligibleForNetting.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsEligibleForNetting.qbl
new file mode 100644
index 0000000..ce1d9c3
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsEligibleForNetting.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsEligibleForNetting
+{
+ #keys: '3[414724.0.292600182][414724.0.292600181][414724.0.292600183]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPI.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPI.qbl
new file mode 100644
index 0000000..a45c711
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPI.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsExcludedFromFulfillmentKPI
+{
+ #keys: '3[414724.0.292600192][414724.0.292600191][414724.0.292600193]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPIUser.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPIUser.qbl
new file mode 100644
index 0000000..6e0bd7a
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsExcludedFromFulfillmentKPIUser.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsExcludedFromFulfillmentKPIUser
+{
+ #keys: '3[414724.0.292600202][414724.0.292600201][414724.0.292600203]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsFirmed.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsFirmed.qbl
new file mode 100644
index 0000000..bd03e0e
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsFirmed.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsFirmed
+{
+ #keys: '3[414724.0.292600212][414724.0.292600211][414724.0.292600213]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLeaf.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLeaf.qbl
new file mode 100644
index 0000000..66c441e
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLeaf.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsLeaf
+{
+ #keys: '3[414724.0.292600222][414724.0.292600221][414724.0.292600223]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLocked.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLocked.qbl
new file mode 100644
index 0000000..7a21a34
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsLocked.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsLocked
+{
+ #keys: '3[414724.0.292600232][414724.0.292600231][414724.0.292600233]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsManuallyConfigured.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsManuallyConfigured.qbl
new file mode 100644
index 0000000..b245b9a
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsManuallyConfigured.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsManuallyConfigured
+{
+ #keys: '3[414724.0.292600242][414724.0.292600241][414724.0.292600243]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsPostponed.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsPostponed.qbl
new file mode 100644
index 0000000..6e85880
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsPostponed.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsPostponed
+{
+ #keys: '3[414724.0.292600252][414724.0.292600251][414724.0.292600253]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsSoftDeleted.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsSoftDeleted.qbl
new file mode 100644
index 0000000..954dea2
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsSoftDeleted.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsSoftDeleted
+{
+ #keys: '3[414724.0.292600262][414724.0.292600261][414724.0.292600263]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsValidData.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsValidData.qbl
new file mode 100644
index 0000000..e50d18d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_IsValidData.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsValidData
+{
+ #keys: '3[414724.0.292600272][414724.0.292600271][414724.0.292600273]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModify.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModify.qbl
new file mode 100644
index 0000000..a8d007f
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModify.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute LastModify
+{
+ #keys: '3[414724.0.292600033][414724.0.292600032][414724.0.292600034]'
+ Description: '鏈�鍚庝慨鏀逛汉'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModifyTime.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModifyTime.qbl
new file mode 100644
index 0000000..36d44c5
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_LastModifyTime.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute LastModifyTime
+{
+ #keys: '3[414724.0.292600021][414724.0.292600020][414724.0.292600022]'
+ Description: '鏈�鍚庢搷浣滄椂闂�'
+ ValueType: DateTime
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderID.qbl
new file mode 100644
index 0000000..1c5d722
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderID
+{
+ #keys: '3[414724.0.292600282][414724.0.292600281][414724.0.292600283]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderLineID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderLineID.qbl
new file mode 100644
index 0000000..6aeeba7
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderLineID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderLineID
+{
+ #keys: '3[414724.0.292600292][414724.0.292600291][414724.0.292600293]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTag.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTag.qbl
new file mode 100644
index 0000000..aa425a4
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTag.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderTag
+{
+ #keys: '3[414724.0.292600042][414724.0.292600041][414724.0.292600043]'
+ Description: '璁㈠崟鐘舵�侊紝鍐插噺鍚庤祴鍊硷紝绾娴�,鏈夐娴嬶紝鏃犻娴嬶紝鍙嶇锛屾巿鏉�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTime.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTime.qbl
new file mode 100644
index 0000000..8e1a43b
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderTime.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderTime
+{
+ #keys: '3[414724.0.292600024][414724.0.292600023][414724.0.292600025]'
+ Description: '璁㈠崟涓嬪崟鏃堕棿'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderType.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderType.qbl
new file mode 100644
index 0000000..f3f52cf
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OrderType.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderType
+{
+ #keys: '3[414724.0.292600018][414724.0.292600017][414724.0.292600019]'
+ Description: '璁㈠崟绫诲瀷'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_OutsideOfPlanningHorizonQuantity.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OutsideOfPlanningHorizonQuantity.qbl
new file mode 100644
index 0000000..ec41ccb
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_OutsideOfPlanningHorizonQuantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OutsideOfPlanningHorizonQuantity
+{
+ #keys: '3[414724.0.292600302][414724.0.292600301][414724.0.292600303]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_PISPConversionFactor.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_PISPConversionFactor.qbl
new file mode 100644
index 0000000..a5128b6
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_PISPConversionFactor.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PISPConversionFactor
+{
+ #keys: '3[414724.0.292600312][414724.0.292600311][414724.0.292600313]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_ParentID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ParentID.qbl
new file mode 100644
index 0000000..1069893
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ParentID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ParentID
+{
+ #keys: '3[414724.0.301487657][414724.0.301487656][414724.0.301487658]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_Price.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Price.qbl
new file mode 100644
index 0000000..9e3c7b9
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Price.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Price
+{
+ #keys: '3[414724.0.292600322][414724.0.292600321][414724.0.292600323]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_PriceUoM.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_PriceUoM.qbl
new file mode 100644
index 0000000..f163e1d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_PriceUoM.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PriceUoM
+{
+ #keys: '3[414724.0.292600332][414724.0.292600331][414724.0.292600333]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_PriorityName.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_PriorityName.qbl
new file mode 100644
index 0000000..62b2da2
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_PriorityName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PriorityName
+{
+ #keys: '3[414724.0.292600342][414724.0.292600341][414724.0.292600343]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductGrade.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductGrade.qbl
new file mode 100644
index 0000000..d5d79e7
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductGrade.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductGrade
+{
+ #keys: '3[414724.0.292600036][414724.0.292600035][414724.0.292600037]'
+ Description: '浜у搧绛夌骇'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductID.qbl
new file mode 100644
index 0000000..4d67010
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_ProductID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductID
+{
+ #keys: '3[414724.0.292600352][414724.0.292600351][414724.0.292600353]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_Quantity.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Quantity.qbl
new file mode 100644
index 0000000..e0194fe
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Quantity.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Quantity
+{
+ #keys: '3[414724.0.292600368][414724.0.292600367][414724.0.292600369]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityInDefaultUoM.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityInDefaultUoM.qbl
new file mode 100644
index 0000000..6008923
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityInDefaultUoM.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute QuantityInDefaultUoM
+{
+ #keys: '3[414724.0.292600378][414724.0.292600377][414724.0.292600379]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityPerDay.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityPerDay.qbl
new file mode 100644
index 0000000..f5d1b6c
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_QuantityPerDay.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute QuantityPerDay
+{
+ #keys: '3[414724.0.292600388][414724.0.292600387][414724.0.292600389]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesDemandConversionFactor.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesDemandConversionFactor.qbl
new file mode 100644
index 0000000..8e79627
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesDemandConversionFactor.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SalesDemandConversionFactor
+{
+ #keys: '3[414724.0.292600398][414724.0.292600397][414724.0.292600399]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesSegmentName.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesSegmentName.qbl
new file mode 100644
index 0000000..dff72c7
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SalesSegmentName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SalesSegmentName
+{
+ #keys: '3[414724.0.292600408][414724.0.292600407][414724.0.292600409]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevere.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevere.qbl
new file mode 100644
index 0000000..79942f2
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevere.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SanityCheckDataMostSevere
+{
+ #keys: '3[414724.0.292600416][414724.0.292600415][414724.0.292600417]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevereCount.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevereCount.qbl
new file mode 100644
index 0000000..37bec23
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataMostSevereCount.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SanityCheckDataMostSevereCount
+{
+ #keys: '3[414724.0.292600426][414724.0.292600425][414724.0.292600427]'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataTotalViolationCount.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataTotalViolationCount.qbl
new file mode 100644
index 0000000..4d8472e
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SanityCheckDataTotalViolationCount.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SanityCheckDataTotalViolationCount
+{
+ #keys: '3[414724.0.292600436][414724.0.292600435][414724.0.292600437]'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SegmentPriority.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SegmentPriority.qbl
new file mode 100644
index 0000000..30bcd18
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SegmentPriority.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SegmentPriority
+{
+ #keys: '3[414724.0.292600030][414724.0.292600029][414724.0.292600031]'
+ Description: '缁嗗垎甯傚満浼樺厛绾�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SheetProfitability.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SheetProfitability.qbl
new file mode 100644
index 0000000..c7d7073
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SheetProfitability.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SheetProfitability
+{
+ #keys: '3[414724.0.292600027][414724.0.292600026][414724.0.292600028]'
+ Description: '澶у紶鐩堝埄姘村钩'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SplitCount.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SplitCount.qbl
new file mode 100644
index 0000000..7481b6d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SplitCount.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SplitCount
+{
+ #keys: '3[414724.0.297907220][414724.0.297907219][414724.0.297907221]'
+ Description: '鎷嗚琛屾暟'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteReason.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteReason.qbl
new file mode 100644
index 0000000..8121f1d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteReason.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SpliteReason
+{
+ #keys: '3[414724.0.297907210][414724.0.297907209][414724.0.297907211]'
+ Description: '鎷嗚鍘熷洜'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteRenmain.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteRenmain.qbl
new file mode 100644
index 0000000..2f9bdf5
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_SpliteRenmain.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SpliteRenmain
+{
+ #keys: '3[414724.0.297907230][414724.0.297907229][414724.0.297907231]'
+ Description: '鎷嗚鍓╀綑閲�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_StartDate.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_StartDate.qbl
new file mode 100644
index 0000000..05bec5c
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_StartDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[414724.0.292600446][414724.0.292600445][414724.0.292600447]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_Status_Splite.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Status_Splite.qbl
new file mode 100644
index 0000000..2b8afbc
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Status_Splite.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Status_Splite
+{
+ #keys: '3[414724.0.297907200][414724.0.297907199][414724.0.297907201]'
+ Description: '鎷嗚鐘舵�侊細鏈媶琛岋紝宸叉媶琛�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_StockingPointID.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_StockingPointID.qbl
new file mode 100644
index 0000000..f48a4d3
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_StockingPointID.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StockingPointID
+{
+ #keys: '3[414724.0.292600456][414724.0.292600455][414724.0.292600457]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_UnitOfMeasureName.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_UnitOfMeasureName.qbl
new file mode 100644
index 0000000..9787651
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_UnitOfMeasureName.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute UnitOfMeasureName
+{
+ #keys: '3[414724.0.292600466][414724.0.292600465][414724.0.292600467]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/Attribute_Variance.qbl b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Variance.qbl
new file mode 100644
index 0000000..38c3a16
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/Attribute_Variance.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Variance
+{
+ #keys: '3[414724.0.292600476][414724.0.292600475][414724.0.292600477]'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DeclarativeTypeIndexRelation_CalcChild.qbl b/_Main/BL/Type_S_DT_CustomOrder/DeclarativeTypeIndexRelation_CalcChild.qbl
new file mode 100644
index 0000000..7306bdb
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DeclarativeTypeIndexRelation_CalcChild.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+DeclarativeTypeIndexRelation CalcChild
+{
+ #keys: '1[414724.0.314769003]'
+ Relation: Child
+ TypeIndex: PrimaryKey_ID
+ TypeIndexExpressions:
+ [
+ DeclarativeRelationTypeIndexExpression
+ {
+ #keys: '1[414724.0.314769004]'
+ TypeIndexExpression: 'this.ParentID()'
+ }
+ ]
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_BusinessType.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_BusinessType.qbl
new file mode 100644
index 0000000..1672b03
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_BusinessType.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: BusinessType
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_CustomerPolicy.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_CustomerPolicy.qbl
new file mode 100644
index 0000000..d08c252
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_CustomerPolicy.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: CustomerPolicy
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_LastModify.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_LastModify.qbl
new file mode 100644
index 0000000..6ef422d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_LastModify.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: LastModify
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderTag.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderTag.qbl
new file mode 100644
index 0000000..9f5cca1
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderTag.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: OrderTag
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderType.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderType.qbl
new file mode 100644
index 0000000..36871b8
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_OrderType.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: OrderType
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_ProductGrade.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_ProductGrade.qbl
new file mode 100644
index 0000000..6571585
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_ProductGrade.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: ProductGrade
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SegmentPriority.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SegmentPriority.qbl
new file mode 100644
index 0000000..1da1a6c
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SegmentPriority.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: SegmentPriority
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SheetProfitability.qbl b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SheetProfitability.qbl
new file mode 100644
index 0000000..6f747a5
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/DefaultValue_SheetProfitability.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: SheetProfitability
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/TypeIndex_PrimaryKey_ID.qbl b/_Main/BL/Type_S_DT_CustomOrder/TypeIndex_PrimaryKey_ID.qbl
new file mode 100644
index 0000000..f455959
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/TypeIndex_PrimaryKey_ID.qbl
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: #root
+TypeIndex PrimaryKey_ID
+{
+ Attributes:
+ [
+ TypeIndexAttribute
+ {
+ ModelElement: ID
+ }
+ ]
+}
diff --git a/_Main/BL/Type_S_DT_CustomOrder/_ROOT_Type_S_DT_CustomOrder.qbl b/_Main/BL/Type_S_DT_CustomOrder/_ROOT_Type_S_DT_CustomOrder.qbl
new file mode 100644
index 0000000..5aef91a
--- /dev/null
+++ b/_Main/BL/Type_S_DT_CustomOrder/_ROOT_Type_S_DT_CustomOrder.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type S_DT_CustomOrder
+{
+ #keys: '5[414724.0.292616028][414724.0.292616026][0.0.0][414724.0.292616027][414724.0.292616029]'
+ BaseType: Object
+ Description: '棰勬媶琛岃鍗�'
+ StructuredName: 'S_DT_CustomOrders'
+}
diff --git a/_Main/BL/Type_S_DT_OrderSpliteRow/Attribute_NewAttribute.qbl b/_Main/BL/Type_S_DT_OrderSpliteRow/Attribute_NewAttribute.qbl
new file mode 100644
index 0000000..5e257e7
--- /dev/null
+++ b/_Main/BL/Type_S_DT_OrderSpliteRow/Attribute_NewAttribute.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute NewAttribute
+{
+ #keys: '3[414724.0.289871335][414724.0.289871334][414724.0.289871336]'
+ ValueType: BinaryValue
+}
diff --git a/_Main/BL/Type_S_DT_OrderSpliteRow/_ROOT_Type_S_DT_OrderSpliteRow.qbl b/_Main/BL/Type_S_DT_OrderSpliteRow/_ROOT_Type_S_DT_OrderSpliteRow.qbl
new file mode 100644
index 0000000..c18766d
--- /dev/null
+++ b/_Main/BL/Type_S_DT_OrderSpliteRow/_ROOT_Type_S_DT_OrderSpliteRow.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type S_DT_OrderSpliteRow
+{
+ #keys: '5[414724.0.289871270][414724.0.289871268][0.0.0][414724.0.289871269][414724.0.289871271]'
+ BaseType: Object
+ Description: '棰勬媶琛岃鍗�'
+ StructuredName: 'S_DT_OrderSpliteRows'
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ForecastDate.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ForecastDate.qbl
new file mode 100644
index 0000000..9dae9a8
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ForecastDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ForecastDate
+{
+ #keys: '3[414724.0.291485648][414724.0.291485647][414724.0.291485649]'
+ Description: '闇�姹傛棩鏈�'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID.qbl
new file mode 100644
index 0000000..b3734cd
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ID
+{
+ #keys: '3[414724.0.291485698][414724.0.291485697][414724.0.291485699]'
+ Description: '涓婚敭ID'
+ IsReadOnly: true
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID_S_DT_CustomOrder.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID_S_DT_CustomOrder.qbl
new file mode 100644
index 0000000..f96559e
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_ID_S_DT_CustomOrder.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ID_S_DT_CustomOrder
+{
+ #keys: '3[414724.0.320004537][414724.0.320004536][414724.0.320004538]'
+ Description: 'S_DT_CustomOrder琛↖D,澶栭敭鍏宠仈锛圤rderID鍦ㄨ鍗曡〃涓嶅敮涓�锛屾棤娉曚娇鐢級'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_OrderID.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_OrderID.qbl
new file mode 100644
index 0000000..394500c
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_OrderID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderID
+{
+ #keys: '3[414724.0.291485665][414724.0.291485664][414724.0.291485666]'
+ Description: '璁㈠崟ID'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_Qty.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_Qty.qbl
new file mode 100644
index 0000000..c24f8c6
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_Qty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Qty
+{
+ #keys: '3[414724.0.291485658][414724.0.291485657][414724.0.291485659]'
+ Description: '鏁伴噺'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_SpliteReason.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_SpliteReason.qbl
new file mode 100644
index 0000000..e2c2bbf
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_SpliteReason.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SpliteReason
+{
+ #keys: '3[414724.0.320004525][414724.0.320004524][414724.0.320004526]'
+ Description: '鎷嗗垎鍘熷洜'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/Attribute_Status.qbl b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_Status.qbl
new file mode 100644
index 0000000..7aac95f
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/Attribute_Status.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Status
+{
+ #keys: '3[414724.0.291485678][414724.0.291485677][414724.0.291485679]'
+ Description: '鐘舵�侊細null/1 鏈夋晥锛�0鍒犻櫎'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/DefaultValue_Status.qbl b/_Main/BL/Type_S_DT_SpliteStruct/DefaultValue_Status.qbl
new file mode 100644
index 0000000..84f8bc0
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/DefaultValue_Status.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ ISOValue: '1'
+ TargetAttribute: Status
+}
diff --git a/_Main/BL/Type_S_DT_SpliteStruct/_ROOT_Type_S_DT_SpliteStruct.qbl b/_Main/BL/Type_S_DT_SpliteStruct/_ROOT_Type_S_DT_SpliteStruct.qbl
new file mode 100644
index 0000000..3b5bd6f
--- /dev/null
+++ b/_Main/BL/Type_S_DT_SpliteStruct/_ROOT_Type_S_DT_SpliteStruct.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type S_DT_SpliteStruct
+{
+ #keys: '5[414724.0.291485609][414724.0.291485607][0.0.0][414724.0.291485608][414724.0.291485610]'
+ BaseType: Object
+ Description: '鎷嗗垎缁撴瀯'
+ StructuredName: 'S_DT_SpliteStructs'
+}
diff --git a/_Main/BL/Type_S_FunctionClass/StaticMethod_SM_OrderToSpliteOrder.qbl b/_Main/BL/Type_S_FunctionClass/StaticMethod_SM_OrderToSpliteOrder.qbl
new file mode 100644
index 0000000..26760bd
--- /dev/null
+++ b/_Main/BL/Type_S_FunctionClass/StaticMethod_SM_OrderToSpliteOrder.qbl
@@ -0,0 +1,207 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod SM_OrderToSpliteOrder (
+ MacroPlan Owner,
+ CustomerOrder OrderInfo,
+ String SpliteReason
+) as owning JSON
+{
+ Description: '璁㈠崟杞负棰勬媶鍒嗚鍗曞嚱鏁�'
+ TextBody:
+ [*
+ /************************************璁㈠崟杞崲涓洪鎷嗗垎璁㈠崟******************************
+ *鍑芥暟鍚嶏細SM_OrderToSpliteOrder
+ *鍒涘缓浜猴細yunying
+ *鍒涘缓鏃堕棿锛�2023-10-26
+ *鎻忚堪锛氳鍗曟媶琛岋紝灏嗕紶鍏ョ殑璁㈠崟瀛樺叆棰勬媶鍒嗚〃锛屽苟鍦ㄨ鍗曡〃涓皢璇ヨ鍗曠Щ闄ゃ��
+ 鍚屾椂鐢熸垚瀛愯鍗曪紙鑻_DT_SpliteStruct瀛樺湪鐩稿悓璁㈠崟鍙凤級
+ *-----------------------------
+ *鍙傛暟锛歄wner MacroPlan
+ * OrderInfo 瑕佽浆涓洪鎷嗗垎鐨勮鍗�
+ * SpliteReason 鎷嗗垎鍘熷洜
+ *****************************************************************************/
+ // 鍒濆鍖栫粨鏋�
+ bStatus := false;
+ strMsg :="";
+ // 鑾峰彇鐗堟湰鍙�,杩欓噷鏄惁闇�瑕佸拰鐗堟湰鍙峰姛鑳藉鎺�
+ VCode :=H_FunctionClass::SM_GenerateID("VC");
+
+ try{
+ if( not isnull( Owner))
+ {
+ // 鎷嗗垎琛屾暟
+ SplitCount := selectset( Owner,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder()=OrderInfo.ID() and obj.Status()=1).Size();
+ // 鎷嗗垎鏁伴噺
+ SpliteQty:= sum( Owner,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder()=OrderInfo.ID() and obj.Status()=1,obj.Qty());
+ // 鍓╀綑鏁伴噺
+ UnSpliteQty:= OrderInfo.Quantity() - SpliteQty;
+ // 淇濇寔鎷嗗垎淇℃伅
+ SCustomOrder:=select( Owner,S_DT_CustomOrder,obj,obj.ID()=OrderInfo.ID());
+ if( isnull( SCustomOrder))
+ {
+ Owner.S_DT_CustomOrder(relnew,BusinessType:=OrderInfo.BusinessType()
+ ,CurrencyID:=OrderInfo.CurrencyID()
+ ,CustomerID:=OrderInfo.CustomerID()
+ ,CustomerName:=OrderInfo.CustomerName()
+ ,CustomerPolicy:=OrderInfo.CustomerPolicy()
+ ,DefaultUOMConversionFactor:=OrderInfo.DefaultUOMConversionFactor()
+ ,DemandUncertaintyPercentage:=OrderInfo.DemandUncertaintyPercentage()
+ ,DerivedPriorityName:=OrderInfo.DerivedPriorityName()
+ ,EndDate:=OrderInfo.EndDate()
+ ,ExpectedQuantity:=OrderInfo.ExpectedQuantity()
+ ,FulfilledQuantity:=OrderInfo.FulfilledQuantity()
+ ,HasPostponedSalesDemand:=OrderInfo.HasPostponedSalesDemand()
+ ,HasValidConversionFactor:=OrderInfo.HasValidConversionFactor()
+ ,ID:=OrderInfo.ID()
+ ,IsEligibleForNetting:=OrderInfo.IsEligibleForNetting()
+ ,IsExcludedFromFulfillmentKPI:=OrderInfo.IsExcludedFromFulfillmentKPI()
+ ,IsExcludedFromFulfillmentKPIUser:=OrderInfo.IsExcludedFromFulfillmentKPIUser()
+ ,IsFirmed:=OrderInfo.IsFirmed()
+ ,IsLeaf := OrderInfo.IsLeaf()
+ ,IsLocked:=OrderInfo.IsLocked()
+ ,IsAvailable := OrderInfo.IsAvailable()
+ ,IsManuallyConfigured:=OrderInfo.IsManuallyConfigured()
+ ,IsPostponed:=OrderInfo.IsPostponed()
+ ,IsSoftDeleted:=OrderInfo.IsSoftDeleted()
+ ,IsValidData:=OrderInfo.IsValidData()
+ ,LastModify:=OrderInfo.LastModify()
+ ,LastModifyTime:=OrderInfo.LastModifyTime()
+ ,OrderID:=OrderInfo.OrderID()
+ ,OrderLineID:=OrderInfo.OrderLineID()
+ ,OrderTag:=OrderInfo.OrderTag()
+ ,OrderTime:=OrderInfo.OrderTime()
+ ,OrderType:=OrderInfo.OrderType()
+ ,OutsideOfPlanningHorizonQuantity:=OrderInfo.OutsideOfPlanningHorizonQuantity()
+ ,PISPConversionFactor:=OrderInfo.PISPConversionFactor()
+ ,Price:=OrderInfo.Price()
+ ,PriceUoM:=OrderInfo.PriceUoM()
+ ,PriorityName:=OrderInfo.PriorityName()
+ ,ProductGrade:=OrderInfo.ProductGrade()
+ ,ProductID:=OrderInfo.ProductID()
+ ,Quantity:=OrderInfo.Quantity()
+ ,QuantityInDefaultUoM:=OrderInfo.QuantityInDefaultUoM()
+ ,QuantityPerDay:=OrderInfo.QuantityPerDay()
+ ,SalesDemandConversionFactor:=OrderInfo.SalesDemandConversionFactor()
+ ,SalesSegmentName:=OrderInfo.SalesSegmentName()
+ ,SanityCheckDataMostSevere:=OrderInfo.SanityCheckDataMostSevere()
+ ,SanityCheckDataMostSevereCount:=OrderInfo.SanityCheckDataMostSevereCount()
+ ,SanityCheckDataTotalViolationCount:=OrderInfo.SanityCheckDataTotalViolationCount()
+ ,SegmentPriority:=OrderInfo.SegmentPriority()
+ ,SheetProfitability:=OrderInfo.SheetProfitability()
+ ,StartDate:=OrderInfo.StartDate()
+ ,StockingPointID:=OrderInfo.StockingPointID()
+ ,UnitOfMeasureName:=OrderInfo.UnitOfMeasureName()
+ ,SplitCount := SplitCount
+ ,SpliteRenmain := UnSpliteQty);
+ }
+ else
+ {
+ SCustomOrder.SplitCount(SplitCount);
+ SCustomOrder.SpliteRenmain(UnSpliteQty);
+ }
+ OId:=0;
+ NewID:="";
+ SpliteOrderInfo :=null( S_DT_CustomOrder,constcontent );
+ // 鐢熸垚瀛愯鍗�
+ traverse( Owner,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder()=OrderInfo.ID())
+ {
+ OId:=OId+1;
+ // 寰楀埌瀵瑰簲鐨勫凡鎷嗗垎璁㈠崟
+ SpliteOrderInfo := select( Owner,S_DT_CustomOrder,objSO,objSO.ID_SpliteStruct()=obj.ID());
+ // 鎷嗗垎琚垹闄わ紝灏嗗凡缁忎繚鎸佺殑鎷嗗垎璁㈠崟璺熼殢鍒犻櫎
+ if(obj.Status()=0)
+ {
+ if(not isnull( SpliteOrderInfo))
+ {
+ SpliteOrderInfo.Delete();
+ }
+ obj.Delete();
+ }
+ else
+ {
+ // 淇濆瓨鏂板鐨勬媶鍒�
+ if(isnull( SpliteOrderInfo))
+ {
+ NewID:=OrderInfo.ID()+"_"+OId.AsQUILL()+"_"+DateTime::ActualGMTTime().Format( "hms");
+ Owner.S_DT_CustomOrder(relnew,BusinessType:=OrderInfo.BusinessType()
+ ,CurrencyID:=OrderInfo.CurrencyID()
+ ,CustomerID:=OrderInfo.CustomerID()
+ ,CustomerName:=OrderInfo.CustomerName()
+ ,CustomerPolicy:=OrderInfo.CustomerPolicy()
+ ,DefaultUOMConversionFactor:=OrderInfo.DefaultUOMConversionFactor()
+ ,DemandUncertaintyPercentage:=OrderInfo.DemandUncertaintyPercentage()
+ ,DerivedPriorityName:=OrderInfo.DerivedPriorityName()
+ ,EndDate:=obj.ForecastDate()
+ ,ExpectedQuantity:=OrderInfo.ExpectedQuantity()
+ ,FulfilledQuantity:=OrderInfo.FulfilledQuantity()
+ ,HasPostponedSalesDemand:=OrderInfo.HasPostponedSalesDemand()
+ ,HasValidConversionFactor:=OrderInfo.HasValidConversionFactor()
+ ,ID:=NewID
+ ,IsEligibleForNetting:=OrderInfo.IsEligibleForNetting()
+ ,IsExcludedFromFulfillmentKPI:=OrderInfo.IsExcludedFromFulfillmentKPI()
+ ,IsExcludedFromFulfillmentKPIUser:=OrderInfo.IsExcludedFromFulfillmentKPIUser()
+ ,IsFirmed:=OrderInfo.IsFirmed()
+ ,IsLeaf := OrderInfo.IsLeaf()
+ ,IsLocked:=OrderInfo.IsLocked()
+ ,IsAvailable := OrderInfo.IsAvailable()
+ ,IsManuallyConfigured:=OrderInfo.IsManuallyConfigured()
+ ,IsPostponed:=OrderInfo.IsPostponed()
+ ,IsSoftDeleted:=OrderInfo.IsSoftDeleted()
+ ,IsValidData:=OrderInfo.IsValidData()
+ ,LastModify:=OrderInfo.LastModify()
+ ,LastModifyTime:=OrderInfo.LastModifyTime()
+ ,OrderID:=OrderInfo.OrderID()
+ ,OrderLineID:=OrderInfo.OrderLineID()
+ ,OrderTag:=OrderInfo.OrderTag()
+ ,OrderTime:=OrderInfo.OrderTime()
+ ,OrderType:=OrderInfo.OrderType()
+ ,OutsideOfPlanningHorizonQuantity:=OrderInfo.OutsideOfPlanningHorizonQuantity()
+ ,PISPConversionFactor:=OrderInfo.PISPConversionFactor()
+ ,Price:=OrderInfo.Price()
+ ,PriceUoM:=OrderInfo.PriceUoM()
+ ,PriorityName:=OrderInfo.PriorityName()
+ ,ProductGrade:=OrderInfo.ProductGrade()
+ ,ProductID:=OrderInfo.ProductID()
+ ,Quantity:=obj.Qty()
+ ,QuantityInDefaultUoM:=OrderInfo.QuantityInDefaultUoM()
+ ,QuantityPerDay:=OrderInfo.QuantityPerDay()
+ ,SalesDemandConversionFactor:=OrderInfo.SalesDemandConversionFactor()
+ ,SalesSegmentName:=OrderInfo.SalesSegmentName()
+ ,SanityCheckDataMostSevere:=OrderInfo.SanityCheckDataMostSevere()
+ ,SanityCheckDataMostSevereCount:=OrderInfo.SanityCheckDataMostSevereCount()
+ ,SanityCheckDataTotalViolationCount:=OrderInfo.SanityCheckDataTotalViolationCount()
+ ,SegmentPriority:=OrderInfo.SegmentPriority()
+ ,SheetProfitability:=OrderInfo.SheetProfitability()
+ ,StartDate:=OrderInfo.StartDate()
+ ,StockingPointID:=OrderInfo.StockingPointID()
+ ,UnitOfMeasureName:=OrderInfo.UnitOfMeasureName()
+ ,ParentID := OrderInfo.ID()
+ ,SpliteReason := obj.SpliteReason()
+ ,ID_SpliteStruct := obj.ID());
+ }
+ }
+ }
+ // 鍒犻櫎璁㈠崟
+ //Order:=select( Owner,SalesDemand.astype( CustomerOrder ),obj,obj.ID()=OrderInfo.ID());
+ //OrderInfo.Delete();
+ bStatus:=true;
+ strMsg:="璁㈠崟锛�"+OrderInfo.OrderID()+"宸茶浆鍏ラ鎷嗗垎璁板綍锛屽彲浣跨敤杩樺師鍔熻兘鎭㈠锛�";
+ }
+ else
+ {
+ strMsg:="鍦烘櫙鍒濆鍖栧け璐ワ紝璇烽�夋嫨鍦烘櫙鍚庝娇鐢ㄨ鍔熻兘銆�";
+ }
+ }
+ onerror
+ {
+ strMsg :="璁剧疆涓洪鎷嗗垎琛屽け璐ワ紝璇疯仈绯荤郴缁熺鐞嗗憳锛�";
+ // 璁板綍閿欒鏃ュ織
+ Owner.H_ErrorLogs(relnew,EClassName := "S_FunctionClass",EDateTime := DateTime::ActualGMTTime(),EFunctionName := "SM_OrderToSpliteOrder",
+ DeveloperInformation := e.DeveloperInformation(),ErrorNr := e.ErrorNr(),DetailedInformation := e.DetailedInformation(),
+ GeneralInformation := e.GeneralInformation());
+ }
+ return JSON::Object().Add( "Status",bStatus)
+ .Add( "VersionCode",VCode)
+ .Add( "Msg",strMsg).Build();
+ *]
+}
diff --git a/_Main/BL/Type_S_FunctionClass/_ROOT_Type_S_FunctionClass.qbl b/_Main/BL/Type_S_FunctionClass/_ROOT_Type_S_FunctionClass.qbl
new file mode 100644
index 0000000..eb20166
--- /dev/null
+++ b/_Main/BL/Type_S_FunctionClass/_ROOT_Type_S_FunctionClass.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type S_FunctionClass
+{
+ #keys: '5[414724.0.288796771][414724.0.288796769][0.0.0][414724.0.288796770][414724.0.288796772]'
+ BaseType: Object
+ Description: '璁㈠崟鎷嗚鎿嶄綔绫�'
+ StructuredName: 'S_FunctionClasss'
+}
diff --git a/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def b/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def
index 4ad9e84..2cd8ea3 100644
--- a/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def
+++ b/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def
@@ -85,6 +85,7 @@
Component MenuDoSync { #keys: '[414384.0.605664172]' BaseType: 'Menu' Properties: [ Image: 'CLOUD_DOWNLOAD' Text: 'DoSync' ] }
Component menuSeparator506 { #keys: '[414702.0.137524309]' BaseType: 'Menu' Properties: [ Separator: true ] }
Component ComponentMenuAnalysisGlobalOTDTable { #keys: '[414702.0.137524953]' BaseType: 'ComponentMenu' Properties: [ ComponentType: 'frmStandardAnalysisGlobalOTDTable' Text: '' ] }
+ Component ComponentMenu749 { #keys: '[414702.1.273394009]' BaseType: 'ComponentMenu' Properties: [ ComponentType: 'frmStandardAnalysis633' Text: '' ] }
]
Properties:
[
@@ -103,6 +104,7 @@
c: MenuDoSync
c: menuSeparator506
c: ComponentMenuAnalysisGlobalOTDTable
+ c: ComponentMenu749
}
]
}
diff --git a/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTop.def b/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTop.def
new file mode 100644
index 0000000..297a438
--- /dev/null
+++ b/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTop.def
@@ -0,0 +1,29 @@
+Quintiq file version 2.0
+Component swTop
+{
+ #keys: '[530.0.3531806]'
+ BaseType: 'swTop'
+ IsDerived: true
+ Children:
+ [
+ Component spTopLeft
+ {
+ #keys: '[530.0.3531807]'
+ BaseType: 'spTopLeft'
+ IsDerived: true
+ Children:
+ [
+ Component Analysis
+ {
+ #keys: '[530.0.3532065]'
+ BaseType: 'Analysis'
+ IsDerived: true
+ Properties:
+ [
+ GlobalInstance: 'GlobalOTDSOP'
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTopMost.def b/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTopMost.def
new file mode 100644
index 0000000..8a8fcd7
--- /dev/null
+++ b/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/Component_swTopMost.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+Component swTopMost
+{
+ #keys: '[530.0.3531801]'
+ BaseType: 'swTopMost'
+ IsDerived: true
+ Children:
+ [
+ Component SplitterPane1
+ {
+ #keys: '[530.0.3531802]'
+ BaseType: 'SplitterPane1'
+ IsDerived: true
+ Children:
+ [
+ #child: swTop
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/_ROOT_Component_frmStandardAnalysis633.def b/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/_ROOT_Component_frmStandardAnalysis633.def
new file mode 100644
index 0000000..a7fd526
--- /dev/null
+++ b/_Main/UI/MacroPlanner/Component_frmStandardAnalysis633/_ROOT_Component_frmStandardAnalysis633.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlanner
+OrphanComponent frmStandardAnalysis633
+{
+ #keys: '[414702.1.273394023]'
+ BaseType: 'frmStandardAnalysis'
+ Children:
+ [
+ #child: swTopMost
+ ]
+ Properties:
+ [
+ Height: 740
+ Image: 'BEER_GLASS'
+ Title: 'Analysis GlobalOTDSOP'
+ Width: 1300
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
new file mode 100644
index 0000000..2f902b8
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+Component ActionBarGroupScenarioComparisonViews #extension
+{
+ Children:
+ [
+ Component ButtonAnnualProductionAndSalesReview
+ {
+ #keys: '[414702.1.286513416]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'COCKTAIL'
+ Label: '骞村害浜ч攢澶嶇洏'
+ Taborder: 8
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageScenarioComparison.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageScenarioComparison.def
new file mode 100644
index 0000000..fb3b421
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageScenarioComparison.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component ActionBarPageScenarioComparison #extension
+{
+ Children:
+ [
+ #child: ActionBarGroupScenarioComparisonViews
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
index 05a14f4..3103966 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
@@ -22,7 +22,7 @@
BaseType: 'WebMenu'
Properties:
[
- Image: 'PIG'
+ Image: 'LEMONADE_GLASS'
Taborder: 6
Title: '骞村害浜ч攢澶嶇洏'
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ActionBarGroupScenarioComparisonViews_ButtonAnnualPro.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ActionBarGroupScenarioComparisonViews_ButtonAnnualPro.def
new file mode 100644
index 0000000..52c5931
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ActionBarGroupScenarioComparisonViews_ButtonAnnualPro.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: ActionBarGroupScenarioComparisonViews/ButtonAnnualProductionAndSalesReview
+Response OnClick () id:Response_TIANMA_JITUAN_ActionBarGroupScenarioComparisonViews_ButtonAnnualProductionAndSalesReview_OnClick
+{
+ #keys: '[414702.1.288075432]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ Precondition:
+ [*
+
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ ApplicationScope.ViewManager().ResetUserViewById( "骞村害浜ч攢澶嶇洏", true );
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_LibSOPImpExp_ContextMenuImport_MenuImportFromCommonIn.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_LibSOPImpExp_ContextMenuImport_MenuImportFromCommonIn.def
deleted file mode 100644
index d927b55..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_LibSOPImpExp_ContextMenuImport_MenuImportFromCommonIn.def
+++ /dev/null
@@ -1,21 +0,0 @@
-Quintiq file version 2.0
-#parent: LibSOPImpExp_ContextMenuImport/MenuImportFromCommonInformationModel
-Response OnClick () id:Response_TIANMA_JITUAN_LibSOPImpExp_ContextMenuImport_MenuImportFromCommonInformationModel_OnClick
-{
- #keys: '[146140.2.683371355]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebMenu_OnClick'
- Precondition:
- [*
- return MacroPlan::HasMacroPlan( MacroPlan, feedback );
- *]
- QuillAction
- {
- Body:
- [*
- dlg := construct( DialogImportCIM );
- dlg.New();
- *]
- 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 219db76..c307f2a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -15,6 +15,7 @@
#child: ActionBarPagePlan
#child: ActionBarPageInventory
#child: ActionBarPageScenarioSelection
+ #child: ActionBarPageScenarioComparison
]
}
Component DataHolderCapacityAndSaleBudgeFilterItem
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_ListCapacityAndSaleBudge.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_ListCapacityAndSaleBudge.def
index 4af954a..1cb79bb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_ListCapacityAndSaleBudge.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_ListCapacityAndSaleBudge.def
@@ -12,7 +12,6 @@
Properties:
[
DataType: 'GlobalOTDTable'
- FixedFilter: '[Number]object.YearNo() = Date::ActualDate().Year()'
Source: 'GlobalOTDTable'
Taborder: 0
Transformation: 'Global_MappingAnnualBudgetData'
@@ -29,7 +28,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"YearNo","title":"YearNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"YearNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DisplayTechSort","title":"DisplayTechSort","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DisplayTechSort"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessSort","title":"BusinessSort","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessSort"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductLineAndSpecification","title":"ProductLineAndSpecification","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductLineAndSpecification"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrgCodeFromBom","title":"OrgCodeFromBom","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrgCodeFromBom"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ResolutionRatio","title":"ResolutionRatio","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ResolutionRatio"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShippingForm","title":"ShippingForm","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShippingForm"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CutsNumber","title":"CutsNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CutsNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CapacityEquivalent","title":"CapacityEquivalent","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CapacityEquivalent"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaskNumber","title":"MaskNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaskNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity1","title":"MonthlyModCapacity1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity1"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity2","title":"MonthlyModCapacity2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity2"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity3","title":"MonthlyModCapacity3","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity3"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity4","title":"MonthlyModCapacity4","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity4"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity5","title":"MonthlyModCapacity5","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity5"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity6","title":"MonthlyModCapacity6","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity6"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity7","title":"MonthlyModCapacity7","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity7"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity8","title":"MonthlyModCapacity8","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity8"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity9","title":"MonthlyModCapacity9","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity9"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity10","title":"MonthlyModCapacity10","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity10"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity11","title":"MonthlyModCapacity11","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity11"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity12","title":"MonthlyModCapacity12","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity12"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity1","title":"MonthlySheetCapacity1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity1"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity2","title":"MonthlySheetCapacity2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity2"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity3","title":"MonthlySheetCapacity3","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity3"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity4","title":"MonthlySheetCapacity4","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity4"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity5","title":"MonthlySheetCapacity5","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity5"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity6","title":"MonthlySheetCapacity6","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity6"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity7","title":"MonthlySheetCapacity7","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity7"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity8","title":"MonthlySheetCapacity8","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity8"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity9","title":"MonthlySheetCapacity9","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity9"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity10","title":"MonthlySheetCapacity10","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity10"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity11","title":"MonthlySheetCapacity11","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity11"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity12","title":"MonthlySheetCapacity12","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity12"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales1","title":"MonthlySales1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales1"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales2","title":"MonthlySales2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales2"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales3","title":"MonthlySales3","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales3"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales4","title":"MonthlySales4","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales4"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales5","title":"MonthlySales5","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales5"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales6","title":"MonthlySales6","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales6"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales7","title":"MonthlySales7","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales7"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales8","title":"MonthlySales8","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales8"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales9","title":"MonthlySales9","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales9"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales10","title":"MonthlySales10","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales10"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales11","title":"MonthlySales11","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales11"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales12","title":"MonthlySales12","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales12"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"YearNo","title":"YearNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"YearNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DisplayTechSort","title":"DisplayTechSort","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DisplayTechSort"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessSort","title":"BusinessSort","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessSort"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductLineAndSpecification","title":"ProductLineAndSpecification","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductLineAndSpecification"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrgCodeFromBom","title":"OrgCodeFromBom","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrgCodeFromBom"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ResolutionRatio","title":"ResolutionRatio","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ResolutionRatio"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShippingForm","title":"ShippingForm","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShippingForm"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CutsNumber","title":"CutsNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CutsNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CapacityEquivalent","title":"CapacityEquivalent","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CapacityEquivalent"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaskNumber","title":"MaskNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaskNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity1","title":"MonthlyModCapacity1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity1"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity2","title":"MonthlyModCapacity2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity2"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity3","title":"MonthlyModCapacity3","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity3"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity4","title":"MonthlyModCapacity4","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity4"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity5","title":"MonthlyModCapacity5","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity5"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity6","title":"MonthlyModCapacity6","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity6"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity7","title":"MonthlyModCapacity7","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity7"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity8","title":"MonthlyModCapacity8","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity8"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity9","title":"MonthlyModCapacity9","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity9"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity10","title":"MonthlyModCapacity10","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity10"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity11","title":"MonthlyModCapacity11","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity11"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlyModCapacity12","title":"MonthlyModCapacity12","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlyModCapacity12"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity1","title":"MonthlySheetCapacity1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity1"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity2","title":"MonthlySheetCapacity2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity2"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity3","title":"MonthlySheetCapacity3","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity3"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity4","title":"MonthlySheetCapacity4","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity4"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity5","title":"MonthlySheetCapacity5","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity5"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity6","title":"MonthlySheetCapacity6","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity6"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity7","title":"MonthlySheetCapacity7","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity7"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity8","title":"MonthlySheetCapacity8","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity8"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity9","title":"MonthlySheetCapacity9","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity9"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity10","title":"MonthlySheetCapacity10","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity10"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity11","title":"MonthlySheetCapacity11","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity11"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySheetCapacity12","title":"MonthlySheetCapacity12","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySheetCapacity12"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales1","title":"MonthlySales1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales1"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales2","title":"MonthlySales2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales2"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales3","title":"MonthlySales3","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales3"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales4","title":"MonthlySales4","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales4"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales5","title":"MonthlySales5","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales5"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales6","title":"MonthlySales6","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales6"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales7","title":"MonthlySales7","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales7"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales8","title":"MonthlySales8","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales8"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales9","title":"MonthlySales9","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales9"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales10","title":"MonthlySales10","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales10"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales11","title":"MonthlySales11","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales11"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MonthlySales12","title":"MonthlySales12","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MonthlySales12"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrganCode","title":"OrganCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrganCode"}}]'
ContextMenu: 'listContextMenuCapacityAndSaleBudge'
SortCriteria: 'BusinessSort;OrganCode;ProductID'
Taborder: 2
@@ -38,6 +37,6 @@
]
Properties:
[
- Taborder: 2
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_pButton.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_pButton.def
new file mode 100644
index 0000000..427fcd9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Component_pButton.def
@@ -0,0 +1,48 @@
+Quintiq file version 2.0
+Component pButton
+{
+ #keys: '[414702.1.268476564]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ButtonGenerateTestData id:ButtonGenerateTestData_136
+ {
+ #keys: '[414702.1.266041306]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'ARROW_CIRCLE2'
+ Label: '鍒锋柊绛涢�夋暟鎹�'
+ Taborder: 0
+ ]
+ }
+ Component ButtonExportDetail id:ButtonExportDetail_97
+ {
+ #keys: '[414702.1.266041310]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'EXPORT1'
+ Label: '瀵煎嚭'
+ Taborder: 2
+ ]
+ }
+ Component ButtonCreateData
+ {
+ #keys: '[414702.1.266042204]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'ICE_CREAM'
+ Label: '鐢熸垚鏁版嵁'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_ButtonGenerateTestData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_ButtonGenerateTestData_OnClick.def
deleted file mode 100644
index 7b8522f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_ButtonGenerateTestData_OnClick.def
+++ /dev/null
@@ -1,25 +0,0 @@
-Quintiq file version 2.0
-#parent: ButtonGenerateTestData
-Response OnClick () id:Response_FormCapacityAndSaleBudge_ButtonGenerateTestData_OnClick
-{
- #keys: '[414384.0.971540692]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- Precondition:
- [*
- return not isnull( MacroPlan );
- *]
- QuillAction
- {
- Body:
- [*
- GlobalOTDTable.InitTestDataByYear( MacroPlan, DataHolderCapacityAndSaleBudgeFilterYear.Data() );
- Global_MappingAnnualBudgetData::SetOrgCodeFromForecast( GlobalOTDTable );
- GlobalOTDSOP::RefreshCapacityAndSaleBudgeFilter( true, GlobalOTDTable, GlobalOTDSOP );
- CapacityAndSaleBudgeFilterItem::Initial( GlobalOTDSOP );
- CapacityAndSaleBudgeFilterYear::Initial( GlobalOTDSOP );
- CapacityAndSaleBudgeFilterMonth::Initial( GlobalOTDSOP );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def
new file mode 100644
index 0000000..55bdd70
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonCreateData_OnClick.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: pButton/ButtonCreateData
+Response OnClick () id:Response_pButton_ButtonCreateData_OnClick
+{
+ #keys: '[414702.1.266042218]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ flag := true;
+
+ flag := GlobalOTDSOP.CapacityAndSaleBudgeFilterYear( relsize ) > 0 and
+ GlobalOTDSOP.CapacityAndSaleBudgeFilterBusinessType( relsize ) > 0 and
+ GlobalOTDSOP.CapacityAndSaleBudgeFilterPlaceOfProductionOfArray( relsize ) > 0;
+
+ return flag;
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ option := WebMessageBox::Question( "璇烽�夋嫨鏁版嵁婧�", "鏁版嵁婀東娴嬭瘯鏁版嵁|鍙栨秷" );
+
+ if ( option = 0 ) {
+ WebMessageBox::Error( "鏁版嵁婀栨殏鏃犳暟鎹�", true );
+ } else if ( option = 1 ) {
+ if ( DataHolderCheckedProduct.Data().Size() = 0 ) {
+ WebMessageBox::Error( "璇峰厛鍦ㄥ乏渚у鑸爮閫夋嫨瑕佺敓鎴愭祴璇曟暟鎹殑浜у搧锛�", true );
+ } else {
+ GlobalOTDTable.InitTestDataByYear( MacroPlan,
+ GlobalOTDSOP,
+ DataHolderCapacityAndSaleBudgeFilterYear.Data(),
+ DataHolderCapacityAndSaleBudgeFilterBusinessType.Data(),
+ DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray.Data(),
+ DataHolderCheckedProduct.Data() );
+ }
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_ButtonExportDetail_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonExportDetail_OnClick\043971.def"
similarity index 85%
rename from _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_ButtonExportDetail_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonExportDetail_OnClick\043971.def"
index e09f8c8..faf0bf7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_ButtonExportDetail_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonExportDetail_OnClick\043971.def"
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: ButtonExportDetail
-Response OnClick () id:Response_FormCapacityAndSaleBudge_ButtonExportDetail_OnClick
+#parent: pButton/ButtonExportDetail_97
+Response OnClick () id:Response_FormCapacityAndSaleBudge_ButtonExportDetail_OnClick_971
{
- #keys: '[414384.0.887310502]'
+ #keys: '[414702.1.266041309]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonGenerateTestData_OnClick\04319.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonGenerateTestData_OnClick\04319.def"
new file mode 100644
index 0000000..6af89c3
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/Response_pButton_ButtonGenerateTestData_OnClick\04319.def"
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: pButton/ButtonGenerateTestData_136
+Response OnClick () id:Response_FormCapacityAndSaleBudge_ButtonGenerateTestData_OnClick_19
+{
+ #keys: '[414702.1.266041305]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not isnull( MacroPlan ) and not isnull( GlobalOTDSOP ) and not isnull( GlobalOTDTable );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ CapacityAndSaleBudgeFilterItem::InitializedData( GlobalOTDSOP );
+ CapacityAndSaleBudgeFilterYear::InitializedData( GlobalOTDSOP );
+ CapacityAndSaleBudgeFilterMonth::InitializedData( GlobalOTDSOP );
+ CapacityAndSaleBudgeFilterBusinessType::InitializedData( GlobalOTDSOP, GlobalOTDTable );
+ CapacityAndSaleBudgeFilterPlaceOfProductionOfArray::InitializedData( GlobalOTDSOP, GlobalOTDTable );
+
+ GlobalOTDTable.Global_MappingAnnualBudgetData( relflush );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/_ROOT_Component_FormCapacityAndSaleBudge.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/_ROOT_Component_FormCapacityAndSaleBudge.def
index 7c799db..95e899e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/_ROOT_Component_FormCapacityAndSaleBudge.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/_ROOT_Component_FormCapacityAndSaleBudge.def
@@ -8,28 +8,7 @@
Children:
[
#child: ListCapacityAndSaleBudge
- Component ButtonExportDetail
- {
- #keys: '[414384.0.887310503]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'EXPORT1'
- Label: '瀵煎嚭'
- Taborder: 1
- ]
- }
- Component ButtonGenerateTestData
- {
- #keys: '[414384.0.971540693]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'IMPORT1'
- Label: '鏍规嵁绛涢�夊勾浠界敓鎴愭祴璇曟暟鎹�'
- Taborder: 0
- ]
- }
+ #child: pButton
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_ChartCapacityAndSaleBudgeChart.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_ChartCapacityAndSaleBudgeChart.def
index 8c71c5c..f3f605d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_ChartCapacityAndSaleBudgeChart.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_ChartCapacityAndSaleBudgeChart.def
@@ -80,6 +80,6 @@
Properties:
[
ContextMenu: 'chartContextMenuCapacityAndSaleBudge'
- Taborder: 7
+ Taborder: 4
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_pFilterCriteria.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_pFilterCriteria.def
new file mode 100644
index 0000000..4ab0d20
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_pFilterCriteria.def
@@ -0,0 +1,60 @@
+Quintiq file version 2.0
+Component pFilterCriteria
+{
+ #keys: '[414702.1.277336951]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component DropDownByBusinessTypeOrByOrgCode id:DropDownByBusinessTypeOrByOrgCode_549
+ {
+ #keys: '[414702.1.277808126]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ Label: '鏍规嵁闈㈡澘鍩哄湴/浜嬩笟閮ㄥ垎缁�'
+ Strings: '闈㈡澘鍩哄湴;浜嬩笟閮�'
+ Taborder: 1
+ ]
+ }
+ Component DropDownTimeGroup id:DropDownTimeGroup_593
+ {
+ #keys: '[414702.1.277808195]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ Label: '鏃堕棿鍒嗙粍'
+ Strings: '鏈�;瀛ｅ害;鍗婂勾;骞�'
+ Taborder: 2
+ ]
+ }
+ Component DropDownSaleOrCapacity id:DropDownSaleOrCapacity_715
+ {
+ #keys: '[414702.1.277808264]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ Label: '浜ц兘/閿�鍞'
+ Strings: '浜ц兘;閿�鍞'
+ Taborder: 3
+ ]
+ }
+ Component ButtonCapacityAndSaleBudgeChartTest id:ButtonCapacityAndSaleBudgeChartTest_844
+ {
+ #keys: '[414702.1.277808330]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'PRESENTATION_CHART'
+ Label: '鐢熸垚鍥捐〃'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Border: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 3
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_pFilterCriteria_ButtonCapacityAndSaleBudgeChartTest_OnClick\043603.def"
similarity index 86%
rename from _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_pFilterCriteria_ButtonCapacityAndSaleBudgeChartTest_OnClick\043603.def"
index cbd7ff2..761a489 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_pFilterCriteria_ButtonCapacityAndSaleBudgeChartTest_OnClick\043603.def"
@@ -1,11 +1,10 @@
Quintiq file version 2.0
-#parent: ButtonCapacityAndSaleBudgeChartTest
-Response OnClick () id:Response_FormCapacityAndSaleBudgeChart_ButtonCapacityAndSaleBudgeChartTest_OnClick
+#parent: pFilterCriteria/ButtonCapacityAndSaleBudgeChartTest_844
+Response OnClick () id:Response_FormCapacityAndSaleBudgeChart_ButtonCapacityAndSaleBudgeChartTest_OnClick_603
{
- #keys: '[414384.0.857443403]'
+ #keys: '[414702.1.277808329]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
QuillAction
{
Body:
@@ -22,5 +21,6 @@
DataHolderCapacityAndSaleBudgeFilterMonth.Data(),
GlobalOTDTable );
*]
+ GroupServerCalls: false
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
index 237e0c6..56d70aa 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
@@ -8,16 +8,6 @@
Children:
[
#child: ChartCapacityAndSaleBudgeChart
- Component ButtonCapacityAndSaleBudgeChartTest
- {
- #keys: '[414384.0.857443217]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '鐢熸垚'
- Taborder: 6
- ]
- }
Component DropDownYears
{
#keys: '[414384.0.857740648]'
@@ -25,7 +15,7 @@
Properties:
[
Label: '骞翠唤'
- Taborder: 2
+ Taborder: 0
Visible: false
]
}
@@ -37,7 +27,7 @@
[
AllowEmpty: true
Label: '浜嬩笟閮�'
- Taborder: 3
+ Taborder: 1
Visible: false
]
}
@@ -49,46 +39,11 @@
[
AllowEmpty: true
Label: '闈㈡澘鍩哄湴'
- Taborder: 4
+ Taborder: 2
Visible: false
]
}
- Component DropDownTimeGroup
- {
- #keys: '[414384.0.857771238]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- InitialValue: '鏈�'
- Label: '鏃堕棿鍒嗙粍'
- Strings: '鏈�;瀛ｅ害;鍗婂勾;骞�'
- Taborder: 1
- ]
- }
- Component DropDownByBusinessTypeOrByOrgCode
- {
- #keys: '[414384.0.857702904]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- InitialValue: '浜嬩笟閮�'
- Label: '鏍规嵁闈㈡澘鍩哄湴/浜嬩笟閮ㄥ垎缁�'
- Strings: '闈㈡澘鍩哄湴;浜嬩笟閮�'
- Taborder: 0
- ]
- }
- Component DropDownSaleOrCapacity
- {
- #keys: '[414384.0.886240556]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- InitialValue: '閿�鍞'
- Label: '閿�鍞/浜ц兘'
- Strings: '閿�鍞;浜ц兘'
- Taborder: 5
- ]
- }
+ #child: pFilterCriteria
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_MatrixEditorCapacityAndSaleBudgeCompare.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_MatrixEditorCapacityAndSaleBudgeCompare.def
index d59a144..2666de7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_MatrixEditorCapacityAndSaleBudgeCompare.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_MatrixEditorCapacityAndSaleBudgeCompare.def
@@ -93,6 +93,6 @@
ContextMenu: 'matrixeditorContextMenuCapacityAndSaleBudgeCompare'
Editable: false
Rows: 'MatrixEditorRowsCapacityAndSaleBudgeCompare'
- Taborder: 2
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_pButton.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_pButton.def
new file mode 100644
index 0000000..52b3f21
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_pButton.def
@@ -0,0 +1,37 @@
+Quintiq file version 2.0
+Component pButton
+{
+ #keys: '[414702.1.272379026]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ButtonCapacityAndSaleBudgeCompare id:ButtonCapacityAndSaleBudgeCompare_956
+ {
+ #keys: '[414702.1.272313474]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'COCKTAIL'
+ Label: '鍒锋柊'
+ Taborder: 0
+ ]
+ }
+ Component ButtonExportCompare id:ButtonExportCompare_364
+ {
+ #keys: '[414702.1.269961255]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'EXPORT1'
+ Label: '瀵煎嚭'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonCapacityAndSaleBudgeCompare_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonCapacityAndSaleBudgeCompare_OnClick\043231.def"
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonCapacityAndSaleBudgeCompare_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonCapacityAndSaleBudgeCompare_OnClick\043231.def"
index 7f559d2..a683e63 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonCapacityAndSaleBudgeCompare_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonCapacityAndSaleBudgeCompare_OnClick\043231.def"
@@ -1,24 +1,20 @@
Quintiq file version 2.0
-#parent: ButtonCapacityAndSaleBudgeCompare
-Response OnClick () id:Response_FormCapacityAndSaleBudgeCompare_ButtonCapacityAndSaleBudgeCompare_OnClick
+#parent: pButton/ButtonCapacityAndSaleBudgeCompare_956
+Response OnClick () id:Response_FormCapacityAndSaleBudgeCompare_ButtonCapacityAndSaleBudgeCompare_OnClick_231
{
- #keys: '[414384.0.818241703]'
+ #keys: '[414702.1.272313473]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
QuillAction
{
Body:
[*
- info( DataHolderMacroPlansForScenarioComparison.Data().Size() );
- info( DataHolderCapacityAndSaleBudgeFilterItem.Data().Size() );
- info( DataHolderCapacityAndSaleBudgeFilterYear.Data().Size() );
- info( DataHolderCapacityAndSaleBudgeFilterMonth.Data().Size() );
GlobalOTDSOP.CapacityAndSaleBudgeCompare( DataHolderMacroPlansForScenarioComparison.Data(),
DataHolderCapacityAndSaleBudgeFilterItem.Data(),
DataHolderCapacityAndSaleBudgeFilterYear.Data(),
DataHolderCapacityAndSaleBudgeFilterMonth.Data(),
GlobalOTDTable );
*]
+ GroupServerCalls: false
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonExportCompare_OnClick.def "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonExportCompare_OnClick\043325.def"
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonExportCompare_OnClick.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonExportCompare_OnClick\043325.def"
index f98be27..1dbc159 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonExportCompare_OnClick.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_pButton_ButtonExportCompare_OnClick\043325.def"
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: ButtonExportCompare
-Response OnClick () id:Response_FormCapacityAndSaleBudgeCompare_ButtonExportCompare_OnClick
+#parent: pButton/ButtonExportCompare_364
+Response OnClick () id:Response_FormCapacityAndSaleBudgeCompare_ButtonExportCompare_OnClick_325
{
- #keys: '[414384.0.881345276]'
+ #keys: '[414702.1.269961254]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
index d44643f..d5e9525 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
@@ -8,27 +8,7 @@
Children:
[
#child: MatrixEditorCapacityAndSaleBudgeCompare
- Component ButtonCapacityAndSaleBudgeCompare
- {
- #keys: '[414384.0.818241675]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '鍒锋柊'
- Taborder: 0
- ]
- }
- Component ButtonExportCompare
- {
- #keys: '[414384.0.881345277]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'EXPORT1'
- Label: '瀵煎嚭'
- Taborder: 1
- ]
- }
+ #child: pButton
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserCh\043171.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserCh\043171.def"
index f254f69..9e21db8 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserCh\043171.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserCh\043171.def"
@@ -5,12 +5,12 @@
#keys: '[414384.0.875704514]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebList_OnUserCheckedChanged'
- GroupServerCalls: true
QuillAction
{
Body:
[*
- DataHolderCapacityAndSaleBudgeFilterYear.Data().Flush();
+ DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray.Data().Flush();
*]
+ GroupServerCalls: false
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserChecke.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserChecke.def
index 5d9bdf7..86b3523 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserChecke.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeFilterPlaceOfProductionOfArray/Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserChecke.def
@@ -1,18 +1,18 @@
Quintiq file version 2.0
#parent: ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray
Response OnUserCheckedChanged (
- structured[CapacityAndSaleBudgeFilterYear] checkeditems
+ structured[CapacityAndSaleBudgeFilterPlaceOfProductionOfArray] checkeditems
) id:Response_ListCapacityAndSaleBudgeFilterPlaceOfProductionOfArray_OnUserCheckedChanged
{
#keys: '[414384.0.875704513]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebList_OnUserCheckedChanged'
- GroupServerCalls: true
QuillAction
{
Body:
[*
- DataHolderCapacityAndSaleBudgeFilterYear.Data( checkeditems.Copy() );
+ DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray.Data( checkeditems.Copy() );
*]
+ GroupServerCalls: false
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_ListSDIP.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_ListSDIP.def
new file mode 100644
index 0000000..6d09b78
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_ListSDIP.def
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+Component ListSDIP #extension
+{
+ Children:
+ [
+ Component DataExtractorSDIP #extension
+ {
+ Properties:
+ [
+ FixedFilter: 'object.ProductInStockingPoint_MP().Product_MP().IsLeaf()and isnull( object.OriginalSalesDemand() )'
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSDIP.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSDIP.def
new file mode 100644
index 0000000..3d7315d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSDIP.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component PanelSDIP #extension
+{
+ Children:
+ [
+ #child: ListSDIP
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSalesDemands.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSalesDemands.def
index 14acdde..15028ad 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSalesDemands.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSalesDemands.def
@@ -4,5 +4,6 @@
Children:
[
#child: PanelAllSalesDemands
+ #child: PanelSDIP
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_listContextMenuSD.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_listContextMenuSD.def
index 4d52db8..d68b0fe 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_listContextMenuSD.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_listContextMenuSD.def
@@ -23,5 +23,27 @@
Title: '淇敼瀹㈡埛璁㈠崟浼樺厛绾у洜瀛愪俊鎭�'
]
}
+ Component MenuSpliteOrder
+ {
+ #keys: '[414724.0.284248096]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Description: '璁㈠崟鎷嗚'
+ Image: 'ARROW_FORK'
+ Taborder: 13
+ Title: '鎷嗚'
+ ]
+ }
+ Component Menu189
+ {
+ #keys: '[414724.0.314997570]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Separator: true
+ Taborder: 12
+ ]
+ }
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Response_TIANMA_JITUAN_ListSalesDemands_MenuSpliteOrder_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Response_TIANMA_JITUAN_ListSalesDemands_MenuSpliteOrder_OnClick.def
new file mode 100644
index 0000000..3274d3e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Response_TIANMA_JITUAN_ListSalesDemands_MenuSpliteOrder_OnClick.def
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#parent: ListSalesDemands
+Response OnClick (
+ SalesDemandBase selection
+) id:Response_ListSalesDemands_MenuSpliteOrder_OnClick
+{
+ #keys: '[414724.0.284211940]'
+ CanBindMultiple: false
+ DefinitionID => //FormSalesDemands/ListSalesDemands/Responsedef_ListSalesDemands_WebMenu_OnClick
+ Initiator: 'MenuSpliteOrder'
+ QuillAction
+ {
+ Body:
+ [*
+ data := selection.astype( CustomerOrder );
+ frmOrderSplite := construct( FrmCustomOrderSpliteRow );
+ frmOrderSplite.dh_Paramer_FCOS().Data( data);
+ frmOrderSplite.ShowModal();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_Panel700.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_Panel700.def
new file mode 100644
index 0000000..48e7fae
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_Panel700.def
@@ -0,0 +1,39 @@
+Quintiq file version 2.0
+Component Panel700
+{
+ #keys: '[414724.0.286088539]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btn_OK_FCOS
+ {
+ #keys: '[414724.0.286088604]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ ButtonSize: 'compact'
+ Image: 'CHECKS'
+ Label: '纭畾'
+ Taborder: 0
+ ]
+ }
+ Component btn_Cancel_FCOS
+ {
+ #keys: '[414724.0.286088615]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ ButtonSize: 'compact'
+ Image: 'NAVIGATE_CROSS_ORANGE'
+ Label: '鍙栨秷'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listActionBarPage229\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listActionBarPage229\0431.def"
new file mode 100644
index 0000000..f67ee63
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listActionBarPage229\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage229 id:listActionBarPage229_1
+{
+ #keys: '[414724.0.290316538]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listContextMenu950\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listContextMenu950\0431.def"
new file mode 100644
index 0000000..434b4de
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_listContextMenu950\0431.def"
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+Component listContextMenu950 id:listContextMenu950_1
+{
+ #keys: '[414724.0.290316540]'
+ BaseType: 'listContextMenu'
+ Children:
+ [
+ Component m_delete_list_SD
+ {
+ #keys: '[414724.0.312760935]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Description: '鍒犻櫎-鎷嗗垎鏄庣粏琛�'
+ Image: 'GARBAGE'
+ Taborder: 3
+ Title: '鍒犻櫎'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_list_SpliteDetails\043136.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_list_SpliteDetails\043136.def"
new file mode 100644
index 0000000..5d0dd72
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_list_SpliteDetails\043136.def"
@@ -0,0 +1,61 @@
+Quintiq file version 2.0
+Component list_SpliteDetails id:list_SpliteDetails_136
+{
+ #keys: '[414724.0.290316536]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component de_splisteDetailsFCOS
+ {
+ #keys: '[414724.0.290316537]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'S_DT_SpliteStruct'
+ ]
+ }
+ #child: listActionBarPage229_1
+ Component DataSetLevel583
+ {
+ #keys: '[414724.0.290316539]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenu950_1
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ForecastDate","title":"闇�姹傛棩鏈�","subtotals":"","tooltip":"","width":10,"display":"shown","editable":false,"attribute":"ForecastDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Qty","title":"鏁伴噺","subtotals":"","tooltip":"","width":8,"display":"shown","editable":true,"attribute":"Qty"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SpliteReason","title":"鎷嗗垎鍘熷洜","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SpliteReason"}}]'
+ ContextMenu: 'listContextMenu950'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Description: '鎷嗗垎鏄庣粏'
+ MinimumRows: 6
+ Taborder: 1
+ ]
+ ResponseDefinitions:
+ [
+ DelegatedResponseDefinition OnClick id:Responsedef_list_SpliteDetails_136_WebMenu_OnClick
+ {
+ #keys: '[414724.0.312731020]'
+ Initiator: 'WebMenu'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[593.0.13413230]'
+ Binding: 'list_SpliteDetails.Selection()'
+ }
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_OperateBtns_FCOS.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_OperateBtns_FCOS.def
new file mode 100644
index 0000000..9f635c7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_OperateBtns_FCOS.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pl_OperateBtns_FCOS
+{
+ #keys: '[414724.0.286058675]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: Panel700
+ ]
+ Properties:
+ [
+ Border: true
+ FixedSize: true
+ Taborder: 6
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_function_FCOS.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_function_FCOS.def
new file mode 100644
index 0000000..a59ba5b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_function_FCOS.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component pl_function_FCOS
+{
+ #keys: '[414724.0.285282557]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btn_add_FCOS
+ {
+ #keys: '[414724.0.290316633]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ ButtonSize: 'compact'
+ Image: 'LINK_ADD'
+ Label: '棰勬媶琛�'
+ Taborder: 1
+ Visible: false
+ ]
+ }
+ Component lb_OrderID_FCOS id:lb_OrderID_FCOS_652
+ {
+ #keys: '[414724.0.290316653]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Description: '璁㈠崟ID'
+ Label: '璁㈠崟鍙凤細'
+ Taborder: 0
+ Text: '2021564445'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Border: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_spliteDetails.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_spliteDetails.def
new file mode 100644
index 0000000..8537261
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_spliteDetails.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+Component pl_spliteDetails
+{
+ #keys: '[414724.0.294615998]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: list_SpliteDetails_136
+ Component Label130
+ {
+ #keys: '[414724.0.290316544]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '鎷嗚鏄庣粏锛�'
+ NumberOfColumns: 0
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 5
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_splite_info.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_splite_info.def
new file mode 100644
index 0000000..ed01ff6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Component_pl_splite_info.def
@@ -0,0 +1,50 @@
+Quintiq file version 2.0
+Component pl_splite_info
+{
+ #keys: '[414724.0.289968198]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component ds_ForcastDate_FCOS id:ds_ForcastDate_FCOS_675
+ {
+ #keys: '[414724.0.289968265]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: '闇�姹傛椂闂达細'
+ Taborder: 0
+ ]
+ }
+ Component np_Qty_FCOS id:np_Qty_FCOS_656
+ {
+ #keys: '[414724.0.289968285]'
+ BaseType: 'WebNumberPicker'
+ Properties:
+ [
+ Label: '鏁伴噺锛�'
+ Min: '0'
+ PlaceHolder: '鏁伴噺涓嶅ぇ浜庤鍗曢噸閲�'
+ Step: 200
+ Taborder: 1
+ ]
+ }
+ Component btn_splite_add
+ {
+ #keys: '[414724.0.289968313]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ ButtonSize: 'compact'
+ Image: 'DOWN_PLUS'
+ Label: '鎷�'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 4
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_Cancel_FCOS_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_Cancel_FCOS_OnClick.def
new file mode 100644
index 0000000..a9de0e2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_Cancel_FCOS_OnClick.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+#parent: Panel700/btn_Cancel_FCOS
+Response OnClick () id:Response_Panel700_btn_Cancel_FCOS_OnClick
+{
+ #keys: '[414724.0.294294721]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ // 鎿嶄綔鎭㈠锛氬垹闄ゆ柊澧炵殑鎷嗗垎鎿嶄綔锛岃繕鍘熷垹闄ょ殑鎷嗗垎鎿嶄綔
+ OrderInfo:=dh_Paramer_FCOS.Data();
+ if( not isnull( OrderInfo))
+ {
+ SOrder:=null( S_DT_CustomOrder,constcontent );
+ // 寰楀埌鎵�鏈夋媶鍒嗘搷浣滆褰�
+ traverse( MacroPlan,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder() = OrderInfo.ID())
+ {
+ SOrder:=select( MacroPlan,S_DT_CustomOrder,objSO,objSO.ID_SpliteStruct() = obj.ID());
+ // 鏃犲搴旂殑鎷嗗垎璁㈠崟锛岃涓烘柊澧炵殑鎿嶄綔锛岃繘琛岀Щ闄�
+ if( isnull( SOrder))
+ {
+ obj.Delete();
+ }
+ else
+ {
+ // 濡傛灉鐘舵�佷负鍒犻櫎鐘舵�侊紝鍒欐仮澶嶅垹闄�
+ if( obj.Status()=0)
+ {
+ obj.Status(1);
+ }
+ }
+ }
+ }
+
+ FrmCustomOrderSpliteRow.Close();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_OK_FCOS_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_OK_FCOS_OnClick.def
new file mode 100644
index 0000000..7106975
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_Panel700_btn_OK_FCOS_OnClick.def
@@ -0,0 +1,38 @@
+Quintiq file version 2.0
+#parent: Panel700/btn_OK_FCOS
+Response OnClick () id:Response_Panel700_btn_OK_FCOS_OnClick
+{
+ #keys: '[414724.0.294747709]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ // 浠庤鍗曡繘鍏ユ媶琛�
+ if( not isnull( dh_Paramer_FCOS.Data()))
+ {
+ // 灏嗚鍗曠Щ闄ゅ苟娣诲姞鍒伴鎷嗚璁㈠崟涓�
+ JResult := S_FunctionClass::SM_OrderToSpliteOrder( MacroPlan,dh_Paramer_FCOS.Data(),ef_SpliteReason_FCOS.Text());
+ if( JResult.Get( "Status").GetBoolean())
+ {
+ // 鐢熸垚鎷嗚璁㈠崟
+ FrmCustomOrderSpliteRow.Close();
+ if( JResult.Get( "Msg").GetString().Length()>0)
+ {
+ WebMessageBox::Information(JResult.Get( "Msg").GetString());
+ }
+ }
+ else
+ {
+ WebMessageBox::Warning(JResult.Get( "Msg").GetString());
+ }
+ }
+ else
+ {
+ // 鐢熸垚鎷嗚璁㈠崟
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_FCOS_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_FCOS_OnDataChanged.def
new file mode 100644
index 0000000..adb671f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_FCOS_OnDataChanged.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: dh_Paramer_FCOS
+Response OnDataChanged () id:Response_FrmCustomOrderSpliteRow_dh_Paramer_FCOS_OnDataChanged
+{
+ #keys: '[414724.0.285614685]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ Form.lb_OrderID_FCOS().Text(this.Data().OrderID());
+ Form.lb_CustomName_FCOS().Text(this.Data().CustomerName());
+ Form.lb_OrderRowNum_FCOS().Text(this.Data().OrderLineID());
+ Form.ds_ForcastDate_FCOS().Date(this.Data().EndDate());
+ Form.de_splisteDetailsFCOS().FixedFilter( "object.ID_S_DT_CustomOrder() = " + this.Data().ID().AsQUILL() + "and object.Status()=1");
+ HQty:=sum( MacroPlan,S_DT_SpliteStruct,Obj,Obj.ID_S_DT_CustomOrder()=this.Data().ID() and Obj.Status()=1,Obj.Qty());
+ Form.np_Qty_FCOS().Max(this.Data().Quantity()-HQty);
+ Form.np_Qty_FCOS().Number(this.Data().Quantity()-HQty);
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_SCustomOrder_FCOS_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_SCustomOrder_FCOS_OnDataChanged.def
new file mode 100644
index 0000000..613258e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_dh_Paramer_SCustomOrder_FCOS_OnDataChanged.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+#parent: dh_Paramer_SCustomOrder_FCOS
+Response OnDataChanged () id:Response_FrmCustomOrderSpliteRow_dh_Paramer_SCustomOrder_FCOS_OnDataChanged
+{
+ #keys: '[414724.0.303295647]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.lb_OrderID_FCOS().Text(this.Data().OrderID());
+ Form.lb_CustomName_FCOS().Text(this.Data().CustomerName());
+ Form.lb_OrderRowNum_FCOS().Text(this.Data().OrderLineID());
+ //Form.np_Qty_FCOS().Max(this.Data().Quantity());
+ //Form.np_Qty_FCOS().Number(this.Data().Quantity());
+ Form.ds_ForcastDate_FCOS().Date(this.Data().EndDate());
+ Form.de_splisteDetailsFCOS().FixedFilter( "object.OrderID() = " + this.Data().OrderID().AsQUILL());
+ HQty:=sum( MacroPlan,S_DT_SpliteStruct,Obj,Obj.OrderID()=this.Data().OrderID(),Obj.Qty());
+ Form.np_Qty_FCOS().Max(this.Data().Quantity()-HQty);
+ Form.np_Qty_FCOS().Number(this.Data().Quantity()-HQty);
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_list_SpliteDetails_136_m_delete_list_SD_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_list_SpliteDetails_136_m_delete_list_SD_OnClick.def
new file mode 100644
index 0000000..c28bb18
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_list_SpliteDetails_136_m_delete_list_SD_OnClick.def
@@ -0,0 +1,37 @@
+Quintiq file version 2.0
+#parent: list_SpliteDetails_136
+Response OnClick (
+ S_DT_SpliteStruct selection
+) id:Response_list_SpliteDetails_136_m_delete_list_SD_OnClick
+{
+ #keys: '[414724.0.314884983]'
+ CanBindMultiple: false
+ DefinitionID => /list_SpliteDetails_136/Responsedef_list_SpliteDetails_136_WebMenu_OnClick
+ Initiator: 'm_delete_list_SD'
+ Precondition:
+ [*
+ return not isnull( selection);
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ OrderInfo:=dh_Paramer_FCOS.Data();
+ if( isnull( OrderInfo))
+ {
+ WebMessageBox::Warning( "鎿嶄綔澶辫触锛岃閲嶆柊閫夋嫨璁㈠崟杩涜鎷嗚锛�");
+ }
+ else
+ {
+ selection.Status(0);
+ Qty_Rows:=sum( MacroPlan,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder()=OrderInfo.ID() and obj.Status()=1,obj.Qty());
+ Qty_Max:=0.0;
+ Qty_Max:= OrderInfo.Quantity()-Qty_Rows;
+
+ np_Qty_FCOS.Max(Qty_Max);
+ np_Qty_FCOS.Number(Qty_Max);
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_function_FCOS_btn_add_FCOS_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_function_FCOS_btn_add_FCOS_OnClick.def
new file mode 100644
index 0000000..7a88594
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_function_FCOS_btn_add_FCOS_OnClick.def
@@ -0,0 +1,32 @@
+Quintiq file version 2.0
+#parent: pl_function_FCOS/btn_add_FCOS
+Response OnClick () id:Response_FrmCustomOrderSpliteRow_btn_add_FCOS_OnClick
+{
+ #keys: '[414724.0.290316632]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not isnull( dh_Paramer_FCOS.Data());
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ JResult := S_FunctionClass::SM_OrderToSpliteOrder( MacroPlan,dh_Paramer_FCOS.Data(),ef_SpliteReason_FCOS.Text());
+ if( JResult.Get( "Status").GetBoolean())
+ {
+ FrmCustomOrderSpliteRow.Close();
+ if( JResult.Get( "Msg").GetString().Length()>0)
+ {
+ WebMessageBox::Information(JResult.Get( "Msg").GetString());
+ }
+ }
+ else
+ {
+ WebMessageBox::Warning(JResult.Get( "Msg").GetString());
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_splite_info_btn_splite_add_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_splite_info_btn_splite_add_OnClick.def
new file mode 100644
index 0000000..906fd8b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/Response_pl_splite_info_btn_splite_add_OnClick.def
@@ -0,0 +1,51 @@
+Quintiq file version 2.0
+#parent: pl_splite_info/btn_splite_add
+Response OnClick () id:Response_pl_splite_info_btn_splite_add_OnClick
+{
+ #keys: '[414724.0.292801656]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not isnull( dh_Paramer_FCOS.Data());
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ // 鎷嗗垎涓�涓鍗�
+ SQty:=[Number]np_Qty_FCOS.Number().Round( 0);
+ if(SQty>0)
+ {
+ OrderInfo :=dh_Paramer_FCOS.Data();
+ MacroPlan.S_DT_SpliteStruct(relnew,ID := H_FunctionClass::SM_GenerateID( "OSR")
+ ,OrderID := OrderInfo.OrderID()
+ ,ID_S_DT_CustomOrder := OrderInfo.ID()
+ ,SpliteReason := ef_SpliteReason_FCOS.Text()
+ ,Qty :=SQty
+ ,Status := 1
+ ,ForecastDate:= ds_ForcastDate_FCOS.Date());
+ // 璁＄畻鍓╀綑鎷嗗垎
+ LQty:= OrderInfo.Quantity()-sum(MacroPlan,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder()=OrderInfo.ID() and obj.Status()=1,obj.Qty()) ;
+ np_Qty_FCOS.Max(LQty);
+ np_Qty_FCOS.Number(LQty);
+ if( np_Qty_FCOS.Max()=0)
+ {
+ WebMessageBox::Information( "璁㈠崟宸茬粡鍏ㄩ儴鎷嗗畬锛�");
+ }
+ }
+ else
+ {
+ if( np_Qty_FCOS.Max()=0)
+ {
+ WebMessageBox::Information( "璁㈠崟宸茬粡鍏ㄩ儴鎷嗗畬锛�");
+ }
+ else
+ {
+ WebMessageBox::Information( "璇疯皟鏁� 璁㈠崟鏁伴噺");
+ }
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/_ROOT_Component_FrmCustomOrderSpliteRow.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/_ROOT_Component_FrmCustomOrderSpliteRow.def
new file mode 100644
index 0000000..770a0fc
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderSpliteRow/_ROOT_Component_FrmCustomOrderSpliteRow.def
@@ -0,0 +1,102 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FrmCustomOrderSpliteRow
+{
+ #keys: '[414724.0.285177352]'
+ Accessibility: 'Extensible'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pl_function_FCOS
+ Component lb_OrderRowNum_FCOS
+ {
+ #keys: '[414724.0.285570507]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '璁㈠崟琛屽彿锛�'
+ Taborder: 1
+ Text: '1.1'
+ ]
+ }
+ Component lb_CustomName_FCOS
+ {
+ #keys: '[414724.0.284201013]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '瀹㈡埛鍚嶇О锛�'
+ Taborder: 2
+ Text: '--灏忕背'
+ ]
+ }
+ Component ef_SpliteReason_FCOS
+ {
+ #keys: '[414724.0.285687770]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ Label: '鎷嗚鍘熷洜锛�'
+ MaxRows: 3
+ Multiline: true
+ PlaceHolder: '璇峰綍鍏�'
+ Taborder: 3
+ ]
+ }
+ Component dh_Paramer_FCOS
+ {
+ #keys: '[414724.0.285920379]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'CustomerOrder'
+ Properties:
+ [
+ Taborder: 8
+ ]
+ }
+ #child: pl_OperateBtns_FCOS
+ #child: pl_splite_info
+ Component dh_splitestruct
+ {
+ #keys: '[414724.0.294099522]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[S_DT_SpliteStruct]*'
+ Children:
+ [
+ Component DataExtractor645
+ {
+ #keys: '[414724.0.293956350]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'S_DT_SpliteStruct'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 7
+ ]
+ }
+ #child: pl_spliteDetails
+ Component dh_Paramer_SCustomOrder_FCOS
+ {
+ #keys: '[414724.0.303602526]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'S_DT_CustomOrder'
+ Properties:
+ [
+ Taborder: 9
+ ]
+ }
+ ]
+ Properties:
+ [
+ Description: '璁㈠崟鎷嗚琛ㄥ崟'
+ Image: 'ARROW_FORK'
+ Title: '璁㈠崟鎷嗚'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel651.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel651.def
new file mode 100644
index 0000000..1b691ad
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel651.def
@@ -0,0 +1,44 @@
+Quintiq file version 2.0
+Component Panel651
+{
+ #keys: '[414724.0.302810875]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btn_delete_FCOV id:btn_delete_FCOV_902
+ {
+ #keys: '[414724.0.302810937]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'GARBAGE'
+ Label: '鍒犻櫎'
+ Taborder: 0
+ ]
+ ResponseDefinitions:
+ [
+ ResponseDefinition OnClick id:Responsedef_Panel651_btn_delete_FCOV_902_OnClick
+ {
+ #keys: '[414724.0.303035901]'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[575.0.41049375]'
+ Binding: 'lisplitedetails.Selection()'
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel713.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel713.def
new file mode 100644
index 0000000..79251c2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_Panel713.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+Component Panel713
+{
+ #keys: '[414724.0.302735923]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: lisplitedetails_450
+ #child: Panel651
+ Component Label963
+ {
+ #keys: '[414724.0.302811066]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '鎷嗚鏄庣粏锛�'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 1
+ Visible: false
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_lisplitedetails\043450.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_lisplitedetails\043450.def"
new file mode 100644
index 0000000..97938b2
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_lisplitedetails\043450.def"
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+Component lisplitedetails id:lisplitedetails_450
+{
+ #keys: '[414724.0.302735971]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component de_liSpliteDetails
+ {
+ #keys: '[414724.0.302735972]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'S_DT_SpliteStruct'
+ ]
+ }
+ #child: listActionBarPage243_1
+ Component DataSetLevel404
+ {
+ #keys: '[414724.0.302735974]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenu199_1
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderID","title":"鍘熻鍗旾D","subtotals":"","tooltip":"","width":10,"display":"shown","editable":false,"attribute":"OrderID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ForecastDate","title":"闇�姹傛棩鏈�","subtotals":"","tooltip":"","width":8,"display":"shown","editable":false,"attribute":"ForecastDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Qty","title":"鏁伴噺","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Qty"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Status","title":"鐘舵��","subtotals":"","tooltip":"","width":6,"display":"shown","editable":false,"attribute":"Status"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SDateTime","title":"鍙戦�佽嚦ERP鏃堕棿","subtotals":"","tooltip":"","width":8,"display":"shown","editable":false,"attribute":"SDateTime"}}]'
+ ContextMenu: 'listContextMenu199'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ MinimumColumns: 5
+ Taborder: 2
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage243\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage243\0431.def"
new file mode 100644
index 0000000..abde5ea
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage243\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage243 id:listActionBarPage243_1
+{
+ #keys: '[414724.0.302735973]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage978\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage978\0431.def"
new file mode 100644
index 0000000..2251089
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listActionBarPage978\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage978 id:listActionBarPage978_1
+{
+ #keys: '[414724.0.300320629]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu199\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu199\0431.def"
new file mode 100644
index 0000000..48d83e2
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu199\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu199 id:listContextMenu199_1
+{
+ #keys: '[414724.0.302735975]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu655\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu655\0431.def"
new file mode 100644
index 0000000..89f84d3
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listContextMenu655\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu655 id:listContextMenu655_1
+{
+ #keys: '[414724.0.300320631]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listOrders\043635.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listOrders\043635.def"
new file mode 100644
index 0000000..d533832
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_listOrders\043635.def"
@@ -0,0 +1,54 @@
+Quintiq file version 2.0
+Component listOrders id:listOrders_635
+{
+ #keys: '[414724.0.300320627]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractor726
+ {
+ #keys: '[414724.0.300320628]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ FixedFilter: 'object.ParentID()=""'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'S_DT_CustomOrder'
+ ]
+ }
+ #child: listActionBarPage978_1
+ Component DataSetLevel439
+ {
+ #keys: '[414724.0.300320630]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenu655_1
+ Component DataSetLevel422
+ {
+ #keys: '[414724.0.315209998]'
+ BaseType: 'WebDataSetLevel'
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":-1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegmentName","title":"閿�鍞儴闂�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SalesSegmentName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"搴撳瓨鐐�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"浜у搧","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"闇�姹傛棩鏈�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomerID","title":"CustomerID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomerID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderID","title":"OrderID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderLineID","title":"OrderLineID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderLineID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasureName","title":"鍗曚綅","subtotals":"","tooltip":"","width":2,"display":"shown","editable":false,"attribute":"UnitOfMeasureName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SplitCount","title":"宸叉媶琛屾暟","subtotals":"","tooltip":"","width":3,"display":"shown","editable":false,"attribute":"SplitCount"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SpliteRenmain","title":"鍓╀綑鏁伴噺","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SpliteRenmain"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SpliteReason","title":"鎷嗚鍘熷洜","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SpliteReason"}}]'
+ RelationFromParent: 'Parent'
+ RelationRepeating: 'Parent'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":-1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegmentName","title":"閿�鍞儴闂�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SalesSegmentName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"搴撳瓨鐐�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"浜у搧","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"闇�姹傛棩鏈�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomerID","title":"CustomerID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomerID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderID","title":"OrderID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderLineID","title":"OrderLineID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderLineID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasureName","title":"鍗曚綅","subtotals":"","tooltip":"","width":2,"display":"shown","editable":false,"attribute":"UnitOfMeasureName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SplitCount","title":"宸叉媶琛屾暟","subtotals":"","tooltip":"","width":3,"display":"shown","editable":false,"attribute":"SplitCount"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SpliteRenmain","title":"鍓╀綑鏁伴噺","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SpliteRenmain"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SpliteReason","title":"鎷嗚鍘熷洜","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SpliteReason"}}]'
+ ContextMenu: 'listContextMenu655'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_DataView.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_DataView.def
new file mode 100644
index 0000000..60d10c1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_DataView.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pl_DataView
+{
+ #keys: '[414724.0.300320579]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: listOrders_635
+ #child: Panel713
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_Function_FCOV.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_Function_FCOV.def
new file mode 100644
index 0000000..9ebb689
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Component_pl_Function_FCOV.def
@@ -0,0 +1,114 @@
+Quintiq file version 2.0
+Component pl_Function_FCOV
+{
+ #keys: '[414724.0.295131518]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btn_sendERP_FCOV
+ {
+ #keys: '[414724.0.295131536]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'EXPORT1'
+ Label: '鍙戦�佽嚦ERP'
+ Taborder: 0
+ ]
+ }
+ Component btn_huanyuan_FCOV
+ {
+ #keys: '[414724.0.295131559]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'ARROW_INTO'
+ Label: '杩樺師'
+ Taborder: 1
+ ]
+ ResponseDefinitions:
+ [
+ ResponseDefinition OnClick id:Responsedef_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick
+ {
+ #keys: '[414724.0.303365423]'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[575.0.65737681]'
+ Binding: 'listOrders.Selection()'
+ }
+ ]
+ }
+ ]
+ }
+ Component btn_splitRow_FCOV
+ {
+ #keys: '[414724.0.295131572]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'GRAPH_FORK'
+ Label: '鎷嗚'
+ Taborder: 2
+ ]
+ ResponseDefinitions:
+ [
+ ResponseDefinition OnClick id:Responsedef_pl_Function_FCOV_btn_splitRow_FCOV_OnClick
+ {
+ #keys: '[414724.0.303295769]'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[575.0.74590107]'
+ Binding: 'listOrders.Selection()'
+ }
+ ]
+ }
+ ]
+ }
+ Component btn_deleteOrder_FCOV
+ {
+ #keys: '[414724.0.323807222]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ ButtonSize: 'compact'
+ Description: '鍒犻櫎瀛愯鍗曟寜閽�'
+ Image: 'GARBAGE'
+ Label: '鍒犻櫎'
+ Taborder: 3
+ ]
+ ResponseDefinitions:
+ [
+ ResponseDefinition OnClick id:Responsedef_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick
+ {
+ #keys: '[414724.0.323889224]'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[607.0.62176891]'
+ Binding: 'listOrders.Selection()'
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ Border: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_Panel651_btn_delete_FCOV_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_Panel651_btn_delete_FCOV_OnClick.def
new file mode 100644
index 0000000..9600271
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_Panel651_btn_delete_FCOV_OnClick.def
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#parent: Panel651/btn_delete_FCOV_902
+Response OnClick (
+ S_DT_SpliteStruct selection
+) id:Response_Panel651_btn_delete_FCOV_OnClick
+{
+ #keys: '[414724.0.302931548]'
+ CanBindMultiple: false
+ DefinitionID => /Panel651/Responsedef_Panel651_btn_delete_FCOV_902_OnClick
+ Precondition:
+ [*
+ return not isnull( selection);
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ selection.Delete();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_listOrders_635_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_listOrders_635_OnSelectionChanged.def
new file mode 100644
index 0000000..c1b8878
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_listOrders_635_OnSelectionChanged.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: listOrders_635
+Response OnSelectionChanged (
+ S_DT_CustomOrder selection
+) id:Response_listOrders_635_OnSelectionChanged
+{
+ #keys: '[414724.0.302697813]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnSelectionChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ Form.de_liSpliteDetails().FixedFilter( "object.OrderID() = " + selection.OrderID().AsQUILL());
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick.def
new file mode 100644
index 0000000..db3389b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick.def
@@ -0,0 +1,36 @@
+Quintiq file version 2.0
+#parent: pl_Function_FCOV/btn_deleteOrder_FCOV
+Response OnClick (
+ S_DT_CustomOrder selection
+) id:Response_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick
+{
+ #keys: '[414724.0.321284302]'
+ CanBindMultiple: false
+ DefinitionID => /pl_Function_FCOV/Responsedef_pl_Function_FCOV_btn_deleteOrder_FCOV_OnClick
+ Precondition:
+ [*
+ return not isnull( selection) and selection.ParentID()<>"";
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ Num:=WebMessageBox::Question("纭鍒犻櫎锛�",true);
+ if( Num=0)
+ {
+ OrderInfo:=select( MacroPlan,SalesDemand.astype( CustomerOrder ),obj,obj.ID()=selection.ParentID());
+ SSI := select(MacroPlan,S_DT_SpliteStruct,obj,obj.ID() = selection.ID_SpliteStruct());
+ if( not isnull( SSI))
+ {
+ SSI.Status(0);
+ }
+ S_FunctionClass::SM_OrderToSpliteOrder( MacroPlan,OrderInfo,"");
+ if( not isnull( selection))
+ {
+ selection.Delete();
+ }
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick.def
new file mode 100644
index 0000000..73cacfd
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+#parent: pl_Function_FCOV/btn_huanyuan_FCOV
+Response OnClick (
+ S_DT_CustomOrder selection
+) id:Response_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick
+{
+ #keys: '[414724.0.303365693]'
+ CanBindMultiple: false
+ DefinitionID => /pl_Function_FCOV/Responsedef_pl_Function_FCOV_btn_huanyuan_FCOV_OnClick
+ Precondition:
+ [*
+ return not isnull( selection) and selection.ParentID()="";
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ Num:=WebMessageBox::Question( "纭瑕佽繕鍘熸媶鍒嗚鍗曞悧锛�
+
+ 娉ㄦ剰锛氳繕鍘熷悗宸叉媶鍒嗙粨鏋滃皢琚竻绌�",true);
+ if(Num=0)
+ {
+ // 娓呯悊鎷嗗垎璁板綍琛�
+ traverse( MacroPlan,S_DT_SpliteStruct,obj,obj.ID_S_DT_CustomOrder()=selection.ID())
+ {
+ obj.Delete();
+ }
+ // 娓呯悊鎷嗗垎璁㈠崟
+ traverse( MacroPlan,S_DT_CustomOrder,obj,obj.ParentID()=selection.ID())
+ {
+ obj.Delete();
+ }
+ // 娓呯悊璁㈠崟
+ selection.Delete();
+ WebMessageBox::Information( "璁㈠崟宸茬粡杩樺師");
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_sendERP_FCOV_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_sendERP_FCOV_OnClick.def
new file mode 100644
index 0000000..07696c8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_sendERP_FCOV_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pl_Function_FCOV/btn_sendERP_FCOV
+Response OnClick () id:Response_pl_Function_FCOV_btn_sendERP_FCOV_OnClick
+{
+ #keys: '[414724.0.295170066]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ WebMessageBox::Information( "鍔熻兘灏氭湭瀹炵幇锛屼簨浠舵墽琛屾垚鍔燂紒");
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_splitRow_FCOV_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_splitRow_FCOV_OnClick.def
new file mode 100644
index 0000000..1f1e7af
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/Response_pl_Function_FCOV_btn_splitRow_FCOV_OnClick.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+#parent: pl_Function_FCOV/btn_splitRow_FCOV
+Response OnClick (
+ S_DT_CustomOrder selection
+) id:Response_pl_Function_FCOV_btn_splitRow_FCOV_OnClick
+{
+ #keys: '[414724.0.303198250]'
+ CanBindMultiple: false
+ DefinitionID => /pl_Function_FCOV/Responsedef_pl_Function_FCOV_btn_splitRow_FCOV_OnClick
+ Precondition:
+ [*
+ return not isnull( selection) and selection.ParentID()="";
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ frmOrderSplite := construct( FrmCustomOrderSpliteRow );
+ orderInfo:= select( MacroPlan,SalesDemand.astype(CustomerOrder ),obj,obj.ID()=selection.ID());
+ frmOrderSplite.dh_Paramer_FCOS().Data(orderInfo);
+ frmOrderSplite.ShowModal();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/_ROOT_Component_FrmCustomOrderView.def b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/_ROOT_Component_FrmCustomOrderView.def
new file mode 100644
index 0000000..466ad03
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmCustomOrderView/_ROOT_Component_FrmCustomOrderView.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FrmCustomOrderView
+{
+ #keys: '[414724.0.294851286]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pl_Function_FCOV
+ #child: pl_DataView
+ ]
+ Properties:
+ [
+ Description: '棰勬媶琛岀獥浣�'
+ Image: 'ARROW_FORK'
+ Title: '鎷嗚璁㈠崟'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Capacity___sale_budge.vw b/_Main/UI/MacroPlannerWebApp/Views/Capacity___sale_budge.vw
deleted file mode 100644
index 901e27f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Views/Capacity___sale_budge.vw
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-{
- viewcontents
- {
- image: 'CHART_HI_LO'
- page: 'ActionBarPageScenarioComparison'
- group: ''
- index: 0
- description: ''
- }
- formatversion: 2
- id: 'Capacity___sale_budge'
- name: 'Capacity & sale budge'
- isglobal: false
- isroot: true
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Views/\345\271\264\345\272\246\344\272\247\351\224\200\345\244\215\347\233\230.vw" "b/_Main/UI/MacroPlannerWebApp/Views/\345\271\264\345\272\246\344\272\247\351\224\200\345\244\215\347\233\230.vw"
index 64db9ed..0516c1b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Views/\345\271\264\345\272\246\344\272\247\351\224\200\345\244\215\347\233\230.vw"
+++ "b/_Main/UI/MacroPlannerWebApp/Views/\345\271\264\345\272\246\344\272\247\351\224\200\345\244\215\347\233\230.vw"
@@ -12,495 +12,59 @@
layout
{
mode: 'open'
- rowPosition: 1
- rowSpan: 4
+ rowPosition: 6
+ rowSpan: 8
columnPosition: 1
- columnSpan: 2
+ columnSpan: 12
}
components
{
+ FormCapacityAndSaleBudge_pButton
+ {
+ sizeRatio: 1
+ }
FormCapacityAndSaleBudge_ListCapacityAndSaleBudge
{
}
FormCapacityAndSaleBudge_DataSetLevelCapacityAndSaleBudge
{
groupDepth: -1
- column_Deleted
- {
- columnId: 'Deleted'
- dataPath: 'Deleted'
- dataType: 'boolean'
- index: 0
- subtotals: ''
- width: 150
- }
- column_YearNo
- {
- columnId: 'YearNo'
- dataPath: 'YearNo'
- dataType: 'number'
- index: 1
- subtotals: ''
- width: 150
- }
- column_OrgCode
- {
- columnId: 'OrgCode'
- dataPath: 'OrgCode'
- dataType: 'string'
- index: 2
- subtotals: ''
- width: 150
- }
- column_DisplayTechnology
- {
- columnId: 'DisplayTechnology'
- dataPath: 'DisplayTechnology'
- dataType: 'string'
- index: 3
- subtotals: ''
- width: 150
- }
+ sort: 'YearNo,ProductID'
column_BusinessType
{
columnId: 'BusinessType'
dataPath: 'BusinessType'
dataType: 'string'
- index: 4
+ index: 0
subtotals: ''
- width: 150
+ width: 107
}
- column_LineAndSpecification
+ column_ProductID
{
- columnId: 'LineAndSpecification'
- dataPath: 'LineAndSpecification'
+ columnId: 'ProductID'
+ dataPath: 'ProductID'
dataType: 'string'
- index: 5
+ index: 1
subtotals: ''
- width: 150
+ width: 178
}
- column_ProductCode
+ column_OrganCode
{
- columnId: 'ProductCode'
- dataPath: 'ProductCode'
+ columnId: 'OrganCode'
+ dataPath: 'OrganCode'
dataType: 'string'
- index: 6
+ index: 2
subtotals: ''
- width: 150
+ width: 98
}
- column_PlaceOfProductionOfArray
+ column_YearNo
{
- columnId: 'PlaceOfProductionOfArray'
- dataPath: 'PlaceOfProductionOfArray'
+ columnId: 'YearNo'
+ dataPath: 'YearNo'
dataType: 'string'
- index: 7
+ index: 3
subtotals: ''
- width: 150
- }
- column_PlaceOfProductionOfEvaporation
- {
- columnId: 'PlaceOfProductionOfEvaporation'
- dataPath: 'PlaceOfProductionOfEvaporation'
- dataType: 'string'
- index: 8
- subtotals: ''
- width: 150
- }
- column_Resolution
- {
- columnId: 'Resolution'
- dataPath: 'Resolution'
- dataType: 'string'
- index: 9
- subtotals: ''
- width: 150
- }
- column_ShippingForm
- {
- columnId: 'ShippingForm'
- dataPath: 'ShippingForm'
- dataType: 'string'
- index: 10
- subtotals: ''
- width: 150
- }
- column_NumberOfCut
- {
- columnId: 'NumberOfCut'
- dataPath: 'NumberOfCut'
- dataType: 'string'
- index: 11
- subtotals: ''
- width: 150
- }
- column_CapacityEquivalent
- {
- columnId: 'CapacityEquivalent'
- dataPath: 'CapacityEquivalent'
- dataType: 'string'
- index: 12
- subtotals: ''
- width: 150
- }
- column_NumberOfMask
- {
- columnId: 'NumberOfMask'
- dataPath: 'NumberOfMask'
- dataType: 'string'
- index: 13
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth1
- {
- columnId: 'CapacityInPCSInMonth1'
- dataPath: 'CapacityInPCSInMonth1'
- dataType: 'real'
- index: 14
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth2
- {
- columnId: 'CapacityInPCSInMonth2'
- dataPath: 'CapacityInPCSInMonth2'
- dataType: 'real'
- index: 15
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth3
- {
- columnId: 'CapacityInPCSInMonth3'
- dataPath: 'CapacityInPCSInMonth3'
- dataType: 'real'
- index: 16
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth4
- {
- columnId: 'CapacityInPCSInMonth4'
- dataPath: 'CapacityInPCSInMonth4'
- dataType: 'real'
- index: 17
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth5
- {
- columnId: 'CapacityInPCSInMonth5'
- dataPath: 'CapacityInPCSInMonth5'
- dataType: 'real'
- index: 18
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth6
- {
- columnId: 'CapacityInPCSInMonth6'
- dataPath: 'CapacityInPCSInMonth6'
- dataType: 'real'
- index: 19
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth7
- {
- columnId: 'CapacityInPCSInMonth7'
- dataPath: 'CapacityInPCSInMonth7'
- dataType: 'real'
- index: 20
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth8
- {
- columnId: 'CapacityInPCSInMonth8'
- dataPath: 'CapacityInPCSInMonth8'
- dataType: 'real'
- index: 21
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth9
- {
- columnId: 'CapacityInPCSInMonth9'
- dataPath: 'CapacityInPCSInMonth9'
- dataType: 'real'
- index: 22
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth10
- {
- columnId: 'CapacityInPCSInMonth10'
- dataPath: 'CapacityInPCSInMonth10'
- dataType: 'real'
- index: 23
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth11
- {
- columnId: 'CapacityInPCSInMonth11'
- dataPath: 'CapacityInPCSInMonth11'
- dataType: 'real'
- index: 24
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSInMonth12
- {
- columnId: 'CapacityInPCSInMonth12'
- dataPath: 'CapacityInPCSInMonth12'
- dataType: 'real'
- index: 25
- subtotals: ''
- width: 150
- }
- column_CapacityInPCSTotal
- {
- columnId: 'CapacityInPCSTotal'
- dataPath: 'CapacityInPCSTotal'
- dataType: 'real'
- index: 26
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth1
- {
- columnId: 'CapacityInSheetInMonth1'
- dataPath: 'CapacityInSheetInMonth1'
- dataType: 'real'
- index: 27
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth2
- {
- columnId: 'CapacityInSheetInMonth2'
- dataPath: 'CapacityInSheetInMonth2'
- dataType: 'real'
- index: 28
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth3
- {
- columnId: 'CapacityInSheetInMonth3'
- dataPath: 'CapacityInSheetInMonth3'
- dataType: 'real'
- index: 29
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth4
- {
- columnId: 'CapacityInSheetInMonth4'
- dataPath: 'CapacityInSheetInMonth4'
- dataType: 'real'
- index: 30
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth5
- {
- columnId: 'CapacityInSheetInMonth5'
- dataPath: 'CapacityInSheetInMonth5'
- dataType: 'real'
- index: 31
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth6
- {
- columnId: 'CapacityInSheetInMonth6'
- dataPath: 'CapacityInSheetInMonth6'
- dataType: 'real'
- index: 32
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth7
- {
- columnId: 'CapacityInSheetInMonth7'
- dataPath: 'CapacityInSheetInMonth7'
- dataType: 'real'
- index: 33
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth8
- {
- columnId: 'CapacityInSheetInMonth8'
- dataPath: 'CapacityInSheetInMonth8'
- dataType: 'real'
- index: 34
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth9
- {
- columnId: 'CapacityInSheetInMonth9'
- dataPath: 'CapacityInSheetInMonth9'
- dataType: 'real'
- index: 35
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth10
- {
- columnId: 'CapacityInSheetInMonth10'
- dataPath: 'CapacityInSheetInMonth10'
- dataType: 'real'
- index: 36
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth11
- {
- columnId: 'CapacityInSheetInMonth11'
- dataPath: 'CapacityInSheetInMonth11'
- dataType: 'real'
- index: 37
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetInMonth12
- {
- columnId: 'CapacityInSheetInMonth12'
- dataPath: 'CapacityInSheetInMonth12'
- dataType: 'real'
- index: 38
- subtotals: ''
- width: 150
- }
- column_CapacityInSheetTotal
- {
- columnId: 'CapacityInSheetTotal'
- dataPath: 'CapacityInSheetTotal'
- dataType: 'real'
- index: 39
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth1
- {
- columnId: 'SaleAmountInMonth1'
- dataPath: 'SaleAmountInMonth1'
- dataType: 'real'
- index: 40
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth2
- {
- columnId: 'SaleAmountInMonth2'
- dataPath: 'SaleAmountInMonth2'
- dataType: 'real'
- index: 41
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth3
- {
- columnId: 'SaleAmountInMonth3'
- dataPath: 'SaleAmountInMonth3'
- dataType: 'real'
- index: 42
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth5
- {
- columnId: 'SaleAmountInMonth5'
- dataPath: 'SaleAmountInMonth5'
- dataType: 'real'
- index: 43
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth4
- {
- columnId: 'SaleAmountInMonth4'
- dataPath: 'SaleAmountInMonth4'
- dataType: 'real'
- index: 44
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth6
- {
- columnId: 'SaleAmountInMonth6'
- dataPath: 'SaleAmountInMonth6'
- dataType: 'real'
- index: 45
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth7
- {
- columnId: 'SaleAmountInMonth7'
- dataPath: 'SaleAmountInMonth7'
- dataType: 'real'
- index: 46
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth8
- {
- columnId: 'SaleAmountInMonth8'
- dataPath: 'SaleAmountInMonth8'
- dataType: 'real'
- index: 47
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth9
- {
- columnId: 'SaleAmountInMonth9'
- dataPath: 'SaleAmountInMonth9'
- dataType: 'real'
- index: 48
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth10
- {
- columnId: 'SaleAmountInMonth10'
- dataPath: 'SaleAmountInMonth10'
- dataType: 'real'
- index: 49
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth11
- {
- columnId: 'SaleAmountInMonth11'
- dataPath: 'SaleAmountInMonth11'
- dataType: 'real'
- index: 50
- subtotals: ''
- width: 150
- }
- column_SaleAmountInMonth12
- {
- columnId: 'SaleAmountInMonth12'
- dataPath: 'SaleAmountInMonth12'
- dataType: 'real'
- index: 51
- subtotals: ''
- width: 150
- }
- column_SaleAmountTotal
- {
- columnId: 'SaleAmountTotal'
- dataPath: 'SaleAmountTotal'
- dataType: 'real'
- index: 52
- subtotals: ''
- width: 150
+ width: 84
}
}
}
@@ -513,20 +77,24 @@
layout
{
mode: 'open'
- rowPosition: 5
- rowSpan: 10
- columnPosition: 5
- columnSpan: 8
+ rowPosition: 14
+ rowSpan: 8
+ columnPosition: 1
+ columnSpan: 12
}
components
{
+ FormCapacityAndSaleBudgeCompare_pButton
+ {
+ sizeRatio: 1
+ }
FormCapacityAndSaleBudgeCompare_MatrixEditorCapacityAndSaleBudgeCompare
{
gridColor: '#c4c4c4'
- totalHeaderWidth: 200
+ totalHeaderWidth: 67
attributeHeaderWidthRatio: 0.6
nameHeaderWidthRatio: 0.4
- columnWidth: 100
+ columnWidth: 264
horizontalGrid: true
verticalGrid: true
backendState
@@ -576,7 +144,7 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 4
+ rowSpan: 5
columnPosition: 3
columnSpan: 2
}
@@ -588,6 +156,7 @@
FormCapacityAndSaleBudgeFilterItem_DataSetLevelCapacityAndSaleBudgeFilterItem
{
groupDepth: -1
+ sort: 'ItemName'
column_ItemName
{
columnId: 'ItemName'
@@ -608,13 +177,17 @@
layout
{
mode: 'open'
- rowPosition: 5
- rowSpan: 11
+ rowPosition: 22
+ rowSpan: 13
columnPosition: 1
- columnSpan: 4
+ columnSpan: 12
}
components
{
+ FormCapacityAndSaleBudgeChart_pFilterCriteria
+ {
+ sizeRatio: 1
+ }
FormCapacityAndSaleBudgeChart_ChartCapacityAndSaleBudgeChart
{
SynchronizationGroup: ''
@@ -636,7 +209,7 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 4
+ rowSpan: 5
columnPosition: 5
columnSpan: 2
}
@@ -669,8 +242,8 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 4
- columnPosition: 7
+ rowSpan: 5
+ columnPosition: 9
columnSpan: 2
}
components
@@ -702,8 +275,8 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 4
- columnPosition: 11
+ rowSpan: 5
+ columnPosition: 7
columnSpan: 2
}
components
@@ -735,8 +308,8 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 4
- columnPosition: 9
+ rowSpan: 5
+ columnPosition: 11
columnSpan: 2
}
components
@@ -759,6 +332,39 @@
}
}
}
+ form_FormScenarioManager
+ {
+ title: 'QLibMacroPlannerWebUI::FormScenarioManager'
+ shown: true
+ componentID: 'QLibMacroPlannerWebUI::FormScenarioManager'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 5
+ columnPosition: 1
+ columnSpan: 2
+ }
+ components
+ {
+ FormScenarioManager_ListScenario
+ {
+ }
+ FormScenarioManager_DataSetLevelScenario
+ {
+ groupDepth: -1
+ column_Name
+ {
+ columnId: 'Name'
+ dataPath: 'Name'
+ dataType: 'string'
+ index: 0
+ subtotals: ''
+ width: 240
+ }
+ }
+ }
+ }
}
userconfigurableinformation
{
diff --git a/_var/_Main/ModelSettings/Common/Dev-23/_ROOT_Role_Dev-23.properties b/_var/_Main/ModelSettings/Common/Dev-23/_ROOT_Role_Dev-23.properties
index fff5930..67e69c8 100644
--- a/_var/_Main/ModelSettings/Common/Dev-23/_ROOT_Role_Dev-23.properties
+++ b/_var/_Main/ModelSettings/Common/Dev-23/_ROOT_Role_Dev-23.properties
@@ -6,6 +6,10 @@
_self.configsettype=Role
_self.description=OTD涓撴樉 闈炴樉 鐗规樉
_self.name=Dev-23
+arg=template:serverargs
+arg.architectdependencies=
+arg.custom=""
+arg.versioncontrolmode=true
domainmodel.ediremotedatasourcedefinition.remotestorage.destination=template:domainmodel.ediremotedatasourcedefinition
domainmodel.ediremotedatasourcedefinition.remotestorage.destination.connection=
domainmodel.ediremotedatasourcedefinition.remotestorage.destination.parameters=
@@ -451,16 +455,56 @@
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sendingcontentcharset=UTF-8
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sockettimeout=0
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.trustmanagername=Q3DSpace
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.connectiongroupname=SERVER
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.outboundrequesttimeout=60
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.connectiongroupname=SERVER
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.outboundrequesttimeout=60
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.connectiongroupname=SERVER
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.integratorid=Q3DSpace
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.outboundrequesttimeout=60
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver=template:domainmodel.integratorconfig.restendpoint
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam1=
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam2=
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationtype=None
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.connectiontimeout=0
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.contenttype=JSON
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.enablehttpmessagelogging=true
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.includerawcontent=false
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.maxconnections=10
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.passonvalidationerrors=false
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.portnumber=8080
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.proxyportnumber=0
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.receivecontentcharset=ASCII
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.requesttimeout=60
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml"
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sendingcontentcharset=utf-8
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sockettimeout=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial=template:domainmodel.integratorconfig.restendpoint
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam1=
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam2=
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationtype=None
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.connectiontimeout=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.contenttype=JSON
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.enablehttpmessagelogging=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.includerawcontent=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.maxconnections=10
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.passonvalidationerrors=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.portnumber=8080
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.proxyportnumber=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.receivecontentcharset=ASCII
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.requesttimeout=60
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml"
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sendingcontentcharset=utf-8
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sockettimeout=0
domainmodel.mdsstoragedefinitionmanager=template:domainmodel.mdsstoragedefinitionmanager
domainmodel.mdsstoragedefinitionmanager.audittrailenabled=false
domainmodel.mdsstoragedefinitionmanager.audittraillocation=
domainmodel.mdsstoragedefinitionmanager.databaseenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoredatasource=MacroPlanner
-domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=true
+domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoreislocal=false
domainmodel.mdsstoragedefinitionmanager.dbformat=Legacy
domainmodel.mdsstoragedefinitionmanager.defaultencryptioncertificate=
diff --git a/_var/_Main/ModelSettings/Common/Dev-25/_ROOT_Role_Dev-25.properties b/_var/_Main/ModelSettings/Common/Dev-25/_ROOT_Role_Dev-25.properties
index f3a0cf5..1dfd972 100644
--- a/_var/_Main/ModelSettings/Common/Dev-25/_ROOT_Role_Dev-25.properties
+++ b/_var/_Main/ModelSettings/Common/Dev-25/_ROOT_Role_Dev-25.properties
@@ -6,6 +6,10 @@
_self.configsettype=Role
_self.description=OTD姹借溅鐢靛瓙 澶╁崕
_self.name=Dev-25
+arg=template:serverargs
+arg.architectdependencies=
+arg.custom=""
+arg.versioncontrolmode=true
domainmodel.ediremotedatasourcedefinition.remotestorage.destination=template:domainmodel.ediremotedatasourcedefinition
domainmodel.ediremotedatasourcedefinition.remotestorage.destination.connection=
domainmodel.ediremotedatasourcedefinition.remotestorage.destination.parameters=
@@ -451,16 +455,56 @@
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sendingcontentcharset=UTF-8
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sockettimeout=0
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.trustmanagername=Q3DSpace
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.connectiongroupname=SERVER
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.outboundrequesttimeout=60
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.connectiongroupname=SERVER
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.outboundrequesttimeout=60
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.connectiongroupname=SERVER
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.integratorid=Q3DSpace
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.outboundrequesttimeout=60
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver=template:domainmodel.integratorconfig.restendpoint
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam1=
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam2=
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationtype=None
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.connectiontimeout=0
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.contenttype=JSON
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.enablehttpmessagelogging=true
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.includerawcontent=false
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.maxconnections=10
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.passonvalidationerrors=false
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.portnumber=8080
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.proxyportnumber=0
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.receivecontentcharset=ASCII
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.requesttimeout=60
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml"
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sendingcontentcharset=utf-8
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sockettimeout=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial=template:domainmodel.integratorconfig.restendpoint
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam1=
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam2=
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationtype=None
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.connectiontimeout=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.contenttype=JSON
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.enablehttpmessagelogging=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.includerawcontent=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.maxconnections=10
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.passonvalidationerrors=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.portnumber=8080
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.proxyportnumber=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.receivecontentcharset=ASCII
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.requesttimeout=60
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml"
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sendingcontentcharset=utf-8
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sockettimeout=0
domainmodel.mdsstoragedefinitionmanager=template:domainmodel.mdsstoragedefinitionmanager
domainmodel.mdsstoragedefinitionmanager.audittrailenabled=false
domainmodel.mdsstoragedefinitionmanager.audittraillocation=
domainmodel.mdsstoragedefinitionmanager.databaseenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoredatasource=MacroPlanner
-domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=true
+domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoreislocal=false
domainmodel.mdsstoragedefinitionmanager.dbformat=Legacy
domainmodel.mdsstoragedefinitionmanager.defaultencryptioncertificate=
diff --git a/_var/_Main/ModelSettings/Common/Dev-27/_ROOT_Role_Dev-27.properties b/_var/_Main/ModelSettings/Common/Dev-27/_ROOT_Role_Dev-27.properties
index 3153388..74586c3 100644
--- a/_var/_Main/ModelSettings/Common/Dev-27/_ROOT_Role_Dev-27.properties
+++ b/_var/_Main/ModelSettings/Common/Dev-27/_ROOT_Role_Dev-27.properties
@@ -6,6 +6,10 @@
_self.configsettype=Role
_self.description=OTD杞﹁浇浜嬩笟
_self.name=Dev-27
+arg=template:serverargs
+arg.architectdependencies=
+arg.custom=""
+arg.versioncontrolmode=true
domainmodel.ediremotedatasourcedefinition.remotestorage.destination=template:domainmodel.ediremotedatasourcedefinition
domainmodel.ediremotedatasourcedefinition.remotestorage.destination.connection=
domainmodel.ediremotedatasourcedefinition.remotestorage.destination.parameters=
@@ -451,16 +455,56 @@
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sendingcontentcharset=UTF-8
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sockettimeout=0
domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.trustmanagername=Q3DSpace
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.connectiongroupname=SERVER
+domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.outboundrequesttimeout=60
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.connectiongroupname=SERVER
+domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.outboundrequesttimeout=60
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.connectiongroupname=SERVER
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.integratorid=Q3DSpace
domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.outboundrequesttimeout=60
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver=template:domainmodel.integratorconfig.restendpoint
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam1=
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam2=
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationtype=None
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.connectiontimeout=0
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.contenttype=JSON
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.enablehttpmessagelogging=true
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.includerawcontent=false
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.maxconnections=10
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.passonvalidationerrors=false
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.portnumber=8080
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.proxyportnumber=0
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.receivecontentcharset=ASCII
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.requesttimeout=60
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml"
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sendingcontentcharset=utf-8
+domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sockettimeout=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial=template:domainmodel.integratorconfig.restendpoint
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam1=
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam2=
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationtype=None
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.connectiontimeout=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.contenttype=JSON
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.enablehttpmessagelogging=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.includerawcontent=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.maxconnections=10
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.passonvalidationerrors=false
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.portnumber=8080
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.proxyportnumber=0
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.receivecontentcharset=ASCII
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.requesttimeout=60
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml"
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sendingcontentcharset=utf-8
+domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sockettimeout=0
domainmodel.mdsstoragedefinitionmanager=template:domainmodel.mdsstoragedefinitionmanager
domainmodel.mdsstoragedefinitionmanager.audittrailenabled=false
domainmodel.mdsstoragedefinitionmanager.audittraillocation=
domainmodel.mdsstoragedefinitionmanager.databaseenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoredatasource=MacroPlanner
-domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=true
+domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoreislocal=false
domainmodel.mdsstoragedefinitionmanager.dbformat=Legacy
domainmodel.mdsstoragedefinitionmanager.defaultencryptioncertificate=
diff --git a/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/Capacity___sale_budge.vw b/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/Capacity___sale_budge.vw
deleted file mode 100644
index 780f9e5..0000000
--- a/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/Capacity___sale_budge.vw
+++ /dev/null
@@ -1,205 +0,0 @@
-Quintiq file version 2.0
-{
- viewcontents
- {
- forms
- {
- form_legacy_1
- {
- title: 'Scenario manager'
- shown: true
- componentID: 'FormScenarioManager'
- layout
- {
- mode: 'open'
- rowPosition: 1
- rowSpan: 8
- columnPosition: 1
- columnSpan: 5
- }
- components
- {
- FormScenarioManager_ListScenario
- {
- }
- FormScenarioManager_DataSetLevelScenario
- {
- groupDepth: -1
- column_All_constraints
- {
- columnId: 'All constraints'
- dataPath: 'All constraints'
- dataType: 'string'
- title: 'All constraints'
- index: 0
- subtotals: ''
- width: 90
- }
- column_Name
- {
- columnId: 'Name'
- dataPath: 'Name'
- dataType: 'string'
- title: '鍚嶇О'
- index: 1
- subtotals: ''
- width: 197
- }
- column_ChangedBy
- {
- columnId: 'ChangedBy'
- dataPath: 'ChangedBy'
- dataType: 'string'
- title: 'Changed by'
- index: 2
- subtotals: ''
- width: 91
- }
- column_ChangedOn
- {
- columnId: 'ChangedOn'
- dataPath: 'ChangedOn'
- dataType: 'datetime'
- title: 'Changed on'
- index: 3
- subtotals: ''
- width: 99
- }
- column_StorageMode
- {
- columnId: 'StorageMode'
- dataPath: 'StorageMode'
- dataType: 'string'
- title: 'StorageMode'
- index: 4
- subtotals: ''
- width: 40
- }
- }
- }
- }
- form_FormOptimizerPuzzles
- {
- title: 'Optimizer Puzzles'
- shown: false
- componentID: 'FormOptimizerPuzzles'
- layout
- {
- mode: 'dockright'
- index: 0
- }
- components
- {
- FormOptimizerPuzzles_ListOptimizerPuzzles
- {
- }
- FormOptimizerPuzzles_DataSetLevelOptimizerPuzzles
- {
- groupDepth: -1
- column_All_constraints
- {
- columnId: 'All constraints'
- dataPath: 'All constraints'
- dataType: 'string'
- title: 'All constraints'
- index: 0
- subtotals: ''
- width: 32
- }
- column_Name
- {
- columnId: 'Name'
- dataPath: 'Name'
- dataType: 'string'
- title: '鍚嶇О'
- index: 1
- subtotals: ''
- width: 109
- }
- column_Description
- {
- columnId: 'Description'
- dataPath: 'Description'
- dataType: 'string'
- title: '鎻忚堪'
- index: 2
- subtotals: ''
- width: 207
- }
- }
- }
- }
- form_FormKPI
- {
- title: 'KPI Dashboard'
- shown: true
- componentID: 'FormKPI'
- layout
- {
- mode: 'dockright'
- index: 1
- }
- components
- {
- FormKPI_PanelKPI
- {
- sizeRatio: 1
- activeChild: 'PanelKPISelection'
- }
- FormKPI_PanelKPIDashboard
- {
- sizeRatio: 1
- }
- FormKPI_PanelKPISelection
- {
- sizeRatio: 1
- }
- FormKPI_ListKPISelection
- {
- QuillViewData
- {
- Food_KPISetting: 'Cost of sales;Fulfillment;Fulfillment target;Inventory holding cost;Labor cost;Margin;Safety stock;Sales;Sourcing cost;Total CO2 emission;Transportation cost;Volume'
- }
- }
- FormKPI_DataSetLevelKPISelection
- {
- groupDepth: -1
- column_All_constraints
- {
- columnId: 'All constraints'
- dataPath: 'All constraints'
- dataType: 'string'
- title: 'All constraints'
- index: 0
- subtotals: ''
- width: 32
- }
- column_Name
- {
- columnId: 'Name'
- dataPath: 'Name'
- dataType: 'string'
- title: '鍚嶇О'
- index: 1
- subtotals: ''
- width: 200
- }
- }
- }
- }
- }
- userconfigurableinformation
- {
- }
- index: 0
- image: 'CHART_HI_LO'
- page: 'ActionBarPageScenarioComparison'
- group: ''
- description: ''
- }
- formatversion: 2
- id: 'Capacity___sale_budge'
- name: 'Capacity & sale budge'
- isglobal: false
- isroot: true
-}
--
Gitblit v1.9.3