From 489022017f8b581ab413455b41ec841879a75e03 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期六, 12 十月 2024 17:48:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick.def | 16
_Main/BL/Type_NewOfflinePlanRow/Attribute_Type.qbl | 13
_Main/BL/Relations/Relation_InterfaceNewOfflinePlanDetailData_InterfaceNewOfflinePlanVersion_In.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged#393.def | 17
_Main/BL/Relations/Relation_ProductMLBMQB_MacroPlan_MacroPlan_ProductMLBMQB.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelExport.def | 12
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl | 2
_Main/BL/Type_NewOfflinePlanRow/_ROOT_Type_NewOfflinePlanRow.qbl | 10
_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPagePower.def | 10
_Main/BL/Type_NewOfflinePlanTable/_ROOT_Type_NewOfflinePlanTable.qbl | 9
_Main/BL/Type_FinancialProductionCell/Attribute_IsUpdate.qbl | 8
_Main/BL/Relations/Relation_ProductPower_MacroPlan_MacroPlan_ProductPower.qbl | 23
_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Column_AssemblyOnlinePlanVersionColumn_Ve.qbl | 26
_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_TimeUnit.qbl | 7
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_CoefficientValue.qbl | 8
_Main/BL/Type_ProductGeneration/Attribute_Generation.qbl | 7
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Product.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListFactory.def | 43
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage623.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def | 25
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuGeneration.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable#358.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnCreated.def | 4
_Main/BL/Type_EnginePipelineRow/Attribute_Demand.qbl | 7
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternName.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl | 349 ++---
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_OrderNr.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_ButtonSearch_OnClick.def | 4
_Main/BL/Type_ProductGeneration/StaticMethod_Initilize.qbl | 16
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor583.def | 98 +
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternStart.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pHeader.def | 26
_Main/BL/Type_EnginePipelineRow/Attribute_Product.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryColumnSearch.def | 8
_Main/BL/Relations/Relation_InterfaceNewOfflinePlanVersion_InterfaceDataset_InterfaceDataset_In.qbl | 23
_Main/BL/Relations/Relation_NewOfflinePlanCell_Detailed_NewOfflinePlanCell_Total.qbl | 23
_Main/BL/Type_NewOfflinePlanRow/Method_Filter.qbl | 17
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Quantity.qbl | 8
_Main/BL/Type_ProductPower/Attribute_Power.qbl | 7
_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_ID.qbl | 8
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Product.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged#925.def | 17
_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductID.qbl | 8
_Main/BL/Type_NewOfflinePlanCell/Function_CalcStartDate.qbl | 13
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_bRefresh_OnClick.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_PanelExport_670_ButtonSearch_OnClick.def | 4
_Main/BL/Type_ProductGeneration/_ROOT_Type_ProductGeneration.qbl | 10
_Main/BL/Type_InventorySummaryReport/Method_GenerateColumn.qbl | 4
_Main/BL/Type_NewOfflinePlanCell/Attribute_EndDate.qbl | 7
_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOf.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Component_pnlLeft#88.def | 61
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_dhNewOfflinePlanTable_OnCreated.def | 22
_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_Name.qbl | 6
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/_ROOT_Type_InterfaceNewOfflinePlanDetailData.qbl | 10
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CoefficientValue.qbl | 8
_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternName.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged.def | 19
_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductionLine.qbl | 8
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_ProductionLine.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_MatrixEditorTable_OnUpdateValue.def | 32
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultAllUnit.qbl | 10
_Main/BL/Type_InventorySummaryReport/Method_GenerateShow#925.qbl | 42
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_EndDate.qbl | 7
_Main/BL/Type_NewOfflinePlanTable/Attribute_SaveDateTime.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def | 2
_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Row_AssemblyOnlinePlanVersionRow_Version.qbl | 23
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl | 9
_Main/BL/Type_ProductMLBMQB/Attribute_MLBMQB.qbl | 7
_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GenerateColumn.qbl | 65 +
_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_InterfaceDataset_InterfaceDataset_Assembl.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListGeneration.def | 43
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListMQBMLB.def | 43
_Main/BL/Type_InterfaceOfflinePlanVersion/_ROOT_Type_InterfaceNewOfflinePlanVersion.qbl | 10
_Main/BL/Type_ProductMLBMQB/StaticMethod_Initilize.qbl | 16
_Main/BL/Relations/Relation_NewOfflinePlanCell_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOff.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged#618.def | 17
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorStart_OnChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelMQBMLB.def | 13
_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_Name.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorEnd_OnChanged.def | 2
_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionSearch_InterfaceDataset_InterfaceDataset_A.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def | 4
_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl | 39
_Main/BL/Type_NewOfflinePlanRow/Attribute_Name.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageMQBMLB.def | 10
_Main/BL/Relations/Relation_ProductGeneration_MacroPlan_MacroPlan_ProductGeneration.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/_ROOT_Component_FormNewOfflinePlan.def | 84 +
_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl | 19
_Main/BL/Type_NewOfflinePlanCell/Attribute_InventoryWeight.qbl | 8
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/_ROOT_Type_AssemblyOnlinePlanVersionSearch.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageFactory.def | 10
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultName.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListPower.def | 43
_Main/BL/Type_ProductPower/StaticMethod_Initilize.qbl | 16
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Order.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu267.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelFactory.def | 25
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl | 38
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage338.def | 10
_Main/BL/Type_Factory/_ROOT_Type_Factory.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged.def | 19
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryReport.def | 16
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl | 2
_Main/BL/Type_NewOfflinePlanCell/Function_CalcEndDate.qbl | 13
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixEditorActionBarPageTable.def | 2
_Main/BL/Type_NewOfflinePlanCell/_ROOT_Type_NewOfflinePlanCell.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_545_ButtonSearch_OnClick#118.def | 4
_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_IsShow.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pDetail.def | 15
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pTotal.def | 14
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuMQBMLB.def | 10
_Main/BL/Type_FinancialProductionSource/Method_AfterImport.qbl | 67
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixeditorContextMenuTable.def | 2
_Main/BL/Type_Factory/Attribute_Name.qbl | 7
_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_InitializeCell.qbl | 12
_Main/BL/Type_NewOfflinePlanCell/Attribute_Order.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged#568.def | 17
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/_ROOT_Component_FormInventorySummaryReport.def | 3
_Main/BL/Type_NewOfflinePlanColumn/Attribute_StartDate.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor515.def | 99 +
_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp | 4
_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl | 21
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def | 19
_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_PanelExport_570_ButtonSearch_OnClick#648.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged.def | 6
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Unit.qbl | 6
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_StartDate.qbl | 8
_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl | 20
_Main/Sys/Repr/Global/FinancialProductionCell.qrp | 21
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPeriod.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_MatrixEditorTable.def | 14
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl | 98
_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl | 13
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged.def | 19
_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternEnd.qbl | 8
_Main/Sys/Repr/Global/ProductInStockingPointInPeriod.qrp | 1
_Main/BL/Type_EnginePipelineRow/DefaultValue_Product.qbl | 6
_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp | 26
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelCategory.def | 6
_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_StartDate.qbl | 7
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductID.qbl | 8
_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanRow_NewOfflinePlanRow_NewOfflineP.qbl | 23
_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_EndDate.qbl | 7
_Main/BL/Type_NewOfflinePlanCell/Attribute_OrderNr.qbl | 8
_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternStart.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 23
_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl | 2
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_TimeUnit.qbl | 8
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternEnd.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPower.def | 13
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_StartDate.qbl | 7
_Main/UI/MacroPlannerWebApp/HighlightRules.hl | 15
_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl | 5
_Main/BL/Type_NewOfflinePlanCell/Attribute_TotalQuantity.qbl | 8
_Main/BL/Type_NewOfflinePlanCell/Attribute_Quantity.qbl | 8
_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductionLine.qbl | 8
_Main/BL/Type_ProductMLBMQB/_ROOT_Type_ProductMLBMQB.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuPower.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged.def | 19
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_TimeUnit.qbl | 6
_Main/BL/Type_Factory/Attribute_ID.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl | 2
_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetColumnByTimeUnit.qbl | 16
_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp | 4
_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_ID.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_Panelleft#847.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelGeneration.def | 13
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl | 62
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuFactory.def | 10
_Main/UI/MacroPlannerWebApp/Views/NewOfflinePlan.vw | 215 +++
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageGeneration.def | 10
_Main/BL/Type_FinancialWeeklyReport/StaticMethod_Initialize.qbl | 6
_Main/BL/Type_NewOfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl | 93 +
_Main/BL/Type_NewOfflinePlanCell/Attribute_StartDate.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelRight.def | 15
_Main/BL/Relations/Relation_Factory_MacroPlan_MacroPlan_Factory.qbl | 23
_Main/BL/Relations/Relation_NewOfflinePlanTable_MacroPlan_MacroPlan_NewOfflinePlanTable.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def | 8
_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_Initialize.qbl | 14
_Main/BL/Type_InventorySummaryReport/Method_Generate.qbl | 45
_Main/BL/Type_Factory/StaticMethod_Initilize.qbl | 15
_Main/BL/Type_NewOfflinePlanColumn/_ROOT_Type_NewOfflinePlanColumn.qbl | 10
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 64
_Main/BL/Type_NewOfflinePlanRow/Function_CalcName.qbl | 13
_Main/BL/Type_NewOfflinePlanColumn/Attribute_EndDate.qbl | 7
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl | 2
_Main/BL/Type_InterfaceOfflinePlanVersion/Attribute_ScenarioName.qbl | 8
_Main/BL/Relations/Relation_NewOfflinePlanRow_NewOfflinePlanCell_NewOfflinePlanCell_NewOfflineP.qbl | 34
_Main/BL/Type_NewOfflinePlanCell/Function_CalcTotalQuantity.qbl | 13
_Main/BL/Type_AssemblyOnlinePlanVersion/_ROOT_Type_AssemblyOnlinePlanVersion.qbl | 10
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl | 3
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl | 20
_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl | 38
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelTable.def | 4
_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Unit.qbl | 8
_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSummaryExport_OnClick.def | 2
/dev/null | 20
_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_PanelExport_ButtonSearch_OnClick.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick.def | 25
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Component_pnlLeft.def | 38
_Main/BL/Type_ProductPower/_ROOT_Type_ProductPower.qbl | 10
205 files changed, 3,159 insertions(+), 656 deletions(-)
diff --git a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionColumn_InterfaceDataset_InterfaceDataset_A.qbl b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionColumn_InterfaceDataset_InterfaceDataset_A.qbl
deleted file mode 100644
index 5933f11..0000000
--- a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionColumn_InterfaceDataset_InterfaceDataset_A.qbl
+++ /dev/null
@@ -1,34 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation AssemblyOnlinePlanVersionColumn_InterfaceDataset_InterfaceDataset_AssemblyOnlinePlanVersionColumn
-{
- #keys: '1[415136.0.1176550032]'
- DeclarativeSequenceRelationStrategy
- {
- #keys: '13[0.0.0][415136.0.1176550051][415136.0.1176550045][415136.0.1176550052][415136.0.1176550046][415136.0.1176550053][415136.0.1176550047][415136.0.1176550054][415136.0.1176550048][415136.0.1176550055][415136.0.1176550049][415136.0.1176550056][415136.0.1176550050]'
- SequenceElementSuffix: 'AssemblyOnlinePlanVersionColumn'
- SequenceSuffix: 'AssemblyOnlinePlanVersionColumn'
- SortAttributes:
- [
- DeclarativeSequenceRelationSortAttribute
- {
- #keys: '1[415136.0.1176550058]'
- Attribute: 'ColumnDate'
- }
- ]
- }
- RelationSide.LeftSide InterfaceDataset
- {
- #keys: '3[415136.0.1176550034][415136.0.1176550033][415136.0.1176550035]'
- Cardinality: '0to1'
- ObjectDefinition: AssemblyOnlinePlanVersionColumn
- OwningSide: 'Reference'
- }
- RelationSide.RightSide AssemblyOnlinePlanVersionColumn
- {
- #keys: '3[415136.0.1176550037][415136.0.1176550036][415136.0.1176550038]'
- Cardinality: '1toN'
- ObjectDefinition: InterfaceDataset
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionRow_InterfaceDataset_InterfaceDataset_Asse.qbl b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionRow_InterfaceDataset_InterfaceDataset_Asse.qbl
deleted file mode 100644
index 7b963fb..0000000
--- a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionRow_InterfaceDataset_InterfaceDataset_Asse.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation AssemblyOnlinePlanVersionRow_InterfaceDataset_InterfaceDataset_AssemblyOnlinePlanVersionRow
-{
- #keys: '1[415136.0.1176550018]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide InterfaceDataset
- {
- #keys: '3[415136.0.1176550020][415136.0.1176550019][415136.0.1176550021]'
- Cardinality: '0to1'
- ObjectDefinition: AssemblyOnlinePlanVersionRow
- OwningSide: 'Reference'
- }
- RelationSide.RightSide AssemblyOnlinePlanVersionRow
- {
- #keys: '3[415136.0.1176550023][415136.0.1176550022][415136.0.1176550024]'
- Cardinality: '1toN'
- ObjectDefinition: InterfaceDataset
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionSearch_InterfaceDataset_InterfaceDataset_A.qbl b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionSearch_InterfaceDataset_InterfaceDataset_A.qbl
new file mode 100644
index 0000000..a609a97
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersionSearch_InterfaceDataset_InterfaceDataset_A.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AssemblyOnlinePlanVersionSearch_InterfaceDataset_InterfaceDataset_AssemblyOnlinePlanVersionSearch
+{
+ #keys: '1[415136.0.1184120209]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceDataset
+ {
+ #keys: '3[415136.0.1184120211][415136.0.1184120210][415136.0.1184120212]'
+ Cardinality: '0to1'
+ ObjectDefinition: AssemblyOnlinePlanVersionSearch
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide AssemblyOnlinePlanVersionSearch
+ {
+ #keys: '3[415136.0.1184120214][415136.0.1184120213][415136.0.1184120215]'
+ Cardinality: '0to1'
+ ObjectDefinition: InterfaceDataset
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Column_AssemblyOnlinePlanVersionColumn_Ve.qbl b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Column_AssemblyOnlinePlanVersionColumn_Ve.qbl
new file mode 100644
index 0000000..48d0b14
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Column_AssemblyOnlinePlanVersionColumn_Ve.qbl
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AssemblyOnlinePlanVersion_Column_AssemblyOnlinePlanVersionColumn_Version
+{
+ #keys: '1[415136.0.1184171015]'
+ DeclarativeSequenceRelationStrategy
+ {
+ #keys: '13[0.0.0][415136.0.1184171034][415136.0.1184171028][415136.0.1184171035][415136.0.1184171029][415136.0.1184171036][415136.0.1184171030][415136.0.1184171037][415136.0.1184171031][415136.0.1184171038][415136.0.1184171032][415136.0.1184171039][415136.0.1184171033]'
+ SequenceElementSuffix: 'VersionColumn'
+ SequenceSuffix: 'VersionColumn'
+ }
+ RelationSide.LeftSide Column
+ {
+ #keys: '3[415136.0.1184171017][415136.0.1184171016][415136.0.1184171018]'
+ Cardinality: '1toN'
+ ObjectDefinition: AssemblyOnlinePlanVersion
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide Version
+ {
+ #keys: '3[415136.0.1184171020][415136.0.1184171019][415136.0.1184171021]'
+ Cardinality: '0to1'
+ ObjectDefinition: AssemblyOnlinePlanVersionColumn
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_InterfaceDataset_InterfaceDataset_Assembl.qbl b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_InterfaceDataset_InterfaceDataset_Assembl.qbl
new file mode 100644
index 0000000..71f40c8
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_InterfaceDataset_InterfaceDataset_Assembl.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AssemblyOnlinePlanVersion_InterfaceDataset_InterfaceDataset_AssemblyOnlinePlanVersion
+{
+ #keys: '1[415136.0.1184171001]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceDataset
+ {
+ #keys: '3[415136.0.1184171003][415136.0.1184171002][415136.0.1184171004]'
+ Cardinality: '0to1'
+ ObjectDefinition: AssemblyOnlinePlanVersion
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide AssemblyOnlinePlanVersion
+ {
+ #keys: '3[415136.0.1184171006][415136.0.1184171005][415136.0.1184171007]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceDataset
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Row_AssemblyOnlinePlanVersionRow_Version.qbl b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Row_AssemblyOnlinePlanVersionRow_Version.qbl
new file mode 100644
index 0000000..503edde
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AssemblyOnlinePlanVersion_Row_AssemblyOnlinePlanVersionRow_Version.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AssemblyOnlinePlanVersion_Row_AssemblyOnlinePlanVersionRow_Version
+{
+ #keys: '1[415136.0.1184170985]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide Row
+ {
+ #keys: '3[415136.0.1184170987][415136.0.1184170986][415136.0.1184170988]'
+ Cardinality: '1toN'
+ ObjectDefinition: AssemblyOnlinePlanVersion
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide Version
+ {
+ #keys: '3[415136.0.1184170990][415136.0.1184170989][415136.0.1184170991]'
+ Cardinality: '0to1'
+ ObjectDefinition: AssemblyOnlinePlanVersionRow
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_Factory_MacroPlan_MacroPlan_Factory.qbl b/_Main/BL/Relations/Relation_Factory_MacroPlan_MacroPlan_Factory.qbl
new file mode 100644
index 0000000..51a56f7
--- /dev/null
+++ b/_Main/BL/Relations/Relation_Factory_MacroPlan_MacroPlan_Factory.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation Factory_MacroPlan_MacroPlan_Factory
+{
+ #keys: '1[415136.0.1188465634]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[415136.0.1188465636][415136.0.1188465635][415136.0.1188465637]'
+ Cardinality: '0to1'
+ ObjectDefinition: Factory
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide Factory
+ {
+ #keys: '3[415136.0.1188465639][415136.0.1188465638][415136.0.1188465640]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_InterfaceNewOfflinePlanDetailData_InterfaceNewOfflinePlanVersion_In.qbl b/_Main/BL/Relations/Relation_InterfaceNewOfflinePlanDetailData_InterfaceNewOfflinePlanVersion_In.qbl
new file mode 100644
index 0000000..d78d574
--- /dev/null
+++ b/_Main/BL/Relations/Relation_InterfaceNewOfflinePlanDetailData_InterfaceNewOfflinePlanVersion_In.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation InterfaceNewOfflinePlanDetailData_InterfaceNewOfflinePlanVersion_InterfaceNewOfflinePlanVersion_InterfaceNewOfflinePlanDetailData
+{
+ #keys: '1[413988.0.1635820084]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceNewOfflinePlanVersion
+ {
+ #keys: '3[413988.0.1635820086][413988.0.1635820085][413988.0.1635820087]'
+ Cardinality: '0to1'
+ ObjectDefinition: InterfaceNewOfflinePlanDetailData
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide InterfaceNewOfflinePlanDetailData
+ {
+ #keys: '3[413988.0.1635820089][413988.0.1635820088][413988.0.1635820090]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceNewOfflinePlanVersion
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_InterfaceNewOfflinePlanVersion_InterfaceDataset_InterfaceDataset_In.qbl b/_Main/BL/Relations/Relation_InterfaceNewOfflinePlanVersion_InterfaceDataset_InterfaceDataset_In.qbl
new file mode 100644
index 0000000..c86c407
--- /dev/null
+++ b/_Main/BL/Relations/Relation_InterfaceNewOfflinePlanVersion_InterfaceDataset_InterfaceDataset_In.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation InterfaceNewOfflinePlanVersion_InterfaceDataset_InterfaceDataset_InterfaceNewOfflinePlanVersion
+{
+ #keys: '1[413988.0.1635820033]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceDataset
+ {
+ #keys: '3[413988.0.1635820035][413988.0.1635820034][413988.0.1635820036]'
+ Cardinality: '0to1'
+ ObjectDefinition: InterfaceNewOfflinePlanVersion
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide InterfaceNewOfflinePlanVersion
+ {
+ #keys: '3[413988.0.1635820038][413988.0.1635820037][413988.0.1635820039]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceDataset
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_NewOfflinePlanCell_Detailed_NewOfflinePlanCell_Total.qbl b/_Main/BL/Relations/Relation_NewOfflinePlanCell_Detailed_NewOfflinePlanCell_Total.qbl
new file mode 100644
index 0000000..5aa8dcc
--- /dev/null
+++ b/_Main/BL/Relations/Relation_NewOfflinePlanCell_Detailed_NewOfflinePlanCell_Total.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation NewOfflinePlanCell_Detailed_NewOfflinePlanCell_Total
+{
+ #keys: '1[413988.0.1603460432]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide Detailed
+ {
+ #keys: '3[413988.0.1603460434][413988.0.1603460433][413988.0.1603460435]'
+ Cardinality: '1toN'
+ ObjectDefinition: NewOfflinePlanCell
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide Total
+ {
+ #keys: '3[413988.0.1603460437][413988.0.1603460436][413988.0.1603460438]'
+ Cardinality: '0to1'
+ ObjectDefinition: NewOfflinePlanCell
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_NewOfflinePlanCell_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOff.qbl b/_Main/BL/Relations/Relation_NewOfflinePlanCell_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOff.qbl
new file mode 100644
index 0000000..3b3e2a0
--- /dev/null
+++ b/_Main/BL/Relations/Relation_NewOfflinePlanCell_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOff.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation NewOfflinePlanCell_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOfflinePlanCell
+{
+ #keys: '1[413988.0.1603460144]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide NewOfflinePlanColumn
+ {
+ #keys: '3[413988.0.1603460146][413988.0.1603460145][413988.0.1603460147]'
+ Cardinality: '0to1'
+ ObjectDefinition: NewOfflinePlanCell
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide NewOfflinePlanCell
+ {
+ #keys: '3[413988.0.1603460149][413988.0.1603460148][413988.0.1603460150]'
+ Cardinality: '1toN'
+ ObjectDefinition: NewOfflinePlanColumn
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_NewOfflinePlanRow_NewOfflinePlanCell_NewOfflinePlanCell_NewOfflineP.qbl b/_Main/BL/Relations/Relation_NewOfflinePlanRow_NewOfflinePlanCell_NewOfflinePlanCell_NewOfflineP.qbl
new file mode 100644
index 0000000..2b549bf
--- /dev/null
+++ b/_Main/BL/Relations/Relation_NewOfflinePlanRow_NewOfflinePlanCell_NewOfflinePlanCell_NewOfflineP.qbl
@@ -0,0 +1,34 @@
+Quintiq file version 2.0
+#parent: #root
+Relation NewOfflinePlanRow_NewOfflinePlanCell_NewOfflinePlanCell_NewOfflinePlanRow
+{
+ #keys: '1[413988.0.1603460131]'
+ DeclarativeSequenceRelationStrategy
+ {
+ #keys: '13[0.0.0][413988.0.1603460275][413988.0.1603460269][413988.0.1603460276][413988.0.1603460270][413988.0.1603460277][413988.0.1603460271][413988.0.1603460278][413988.0.1603460272][413988.0.1603460279][413988.0.1603460273][413988.0.1603460280][413988.0.1603460274]'
+ SequenceElementSuffix: 'NOPCell'
+ SequenceSuffix: 'NOPCell'
+ SortAttributes:
+ [
+ DeclarativeSequenceRelationSortAttribute
+ {
+ #keys: '1[413988.0.1603460282]'
+ Attribute: 'StartDate'
+ }
+ ]
+ }
+ RelationSide.LeftSide NewOfflinePlanCell
+ {
+ #keys: '3[413988.0.1603460133][413988.0.1603460132][413988.0.1603460134]'
+ Cardinality: '1toN'
+ ObjectDefinition: NewOfflinePlanRow
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide NewOfflinePlanRow
+ {
+ #keys: '3[413988.0.1603460136][413988.0.1603460135][413988.0.1603460137]'
+ Cardinality: '0to1'
+ ObjectDefinition: NewOfflinePlanCell
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_NewOfflinePlanTable_MacroPlan_MacroPlan_NewOfflinePlanTable.qbl b/_Main/BL/Relations/Relation_NewOfflinePlanTable_MacroPlan_MacroPlan_NewOfflinePlanTable.qbl
new file mode 100644
index 0000000..894617c
--- /dev/null
+++ b/_Main/BL/Relations/Relation_NewOfflinePlanTable_MacroPlan_MacroPlan_NewOfflinePlanTable.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation NewOfflinePlanTable_MacroPlan_MacroPlan_NewOfflinePlanTable
+{
+ #keys: '1[413988.0.1603460049]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[413988.0.1603460051][413988.0.1603460050][413988.0.1603460052]'
+ Cardinality: '0to1'
+ ObjectDefinition: NewOfflinePlanTable
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide NewOfflinePlanTable
+ {
+ #keys: '3[413988.0.1603460054][413988.0.1603460053][413988.0.1603460055]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOf.qbl b/_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOf.qbl
new file mode 100644
index 0000000..c0d44b2
--- /dev/null
+++ b/_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOf.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation NewOfflinePlanTable_NewOfflinePlanColumn_NewOfflinePlanColumn_NewOfflinePlanTable
+{
+ #keys: '1[413988.0.1603460118]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide NewOfflinePlanColumn
+ {
+ #keys: '3[413988.0.1603460120][413988.0.1603460119][413988.0.1603460121]'
+ Cardinality: '1toN'
+ ObjectDefinition: NewOfflinePlanTable
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide NewOfflinePlanTable
+ {
+ #keys: '3[413988.0.1603460123][413988.0.1603460122][413988.0.1603460124]'
+ Cardinality: '0to1'
+ ObjectDefinition: NewOfflinePlanColumn
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanRow_NewOfflinePlanRow_NewOfflineP.qbl b/_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanRow_NewOfflinePlanRow_NewOfflineP.qbl
new file mode 100644
index 0000000..2f26b34
--- /dev/null
+++ b/_Main/BL/Relations/Relation_NewOfflinePlanTable_NewOfflinePlanRow_NewOfflinePlanRow_NewOfflineP.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation NewOfflinePlanTable_NewOfflinePlanRow_NewOfflinePlanRow_NewOfflinePlanTable
+{
+ #keys: '1[413988.0.1603460091]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide NewOfflinePlanRow
+ {
+ #keys: '3[413988.0.1603460093][413988.0.1603460092][413988.0.1603460094]'
+ Cardinality: '1toN'
+ ObjectDefinition: NewOfflinePlanTable
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide NewOfflinePlanTable
+ {
+ #keys: '3[413988.0.1603460096][413988.0.1603460095][413988.0.1603460097]'
+ Cardinality: '0to1'
+ ObjectDefinition: NewOfflinePlanRow
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_ProductGeneration_MacroPlan_MacroPlan_ProductGeneration.qbl b/_Main/BL/Relations/Relation_ProductGeneration_MacroPlan_MacroPlan_ProductGeneration.qbl
new file mode 100644
index 0000000..78c2e57
--- /dev/null
+++ b/_Main/BL/Relations/Relation_ProductGeneration_MacroPlan_MacroPlan_ProductGeneration.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation ProductGeneration_MacroPlan_MacroPlan_ProductGeneration
+{
+ #keys: '1[415136.0.1188500009]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[415136.0.1188500011][415136.0.1188500010][415136.0.1188500012]'
+ Cardinality: '0to1'
+ ObjectDefinition: ProductGeneration
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide ProductGeneration
+ {
+ #keys: '3[415136.0.1188500014][415136.0.1188500013][415136.0.1188500015]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_ProductMLBMQB_MacroPlan_MacroPlan_ProductMLBMQB.qbl b/_Main/BL/Relations/Relation_ProductMLBMQB_MacroPlan_MacroPlan_ProductMLBMQB.qbl
new file mode 100644
index 0000000..febe363
--- /dev/null
+++ b/_Main/BL/Relations/Relation_ProductMLBMQB_MacroPlan_MacroPlan_ProductMLBMQB.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation ProductMLBMQB_MacroPlan_MacroPlan_ProductMLBMQB
+{
+ #keys: '1[415136.0.1188500048]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[415136.0.1188500050][415136.0.1188500049][415136.0.1188500051]'
+ Cardinality: '0to1'
+ ObjectDefinition: ProductMLBMQB
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide ProductMLBMQB
+ {
+ #keys: '3[415136.0.1188500053][415136.0.1188500052][415136.0.1188500054]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_ProductPower_MacroPlan_MacroPlan_ProductPower.qbl b/_Main/BL/Relations/Relation_ProductPower_MacroPlan_MacroPlan_ProductPower.qbl
new file mode 100644
index 0000000..255ce07
--- /dev/null
+++ b/_Main/BL/Relations/Relation_ProductPower_MacroPlan_MacroPlan_ProductPower.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation ProductPower_MacroPlan_MacroPlan_ProductPower
+{
+ #keys: '1[415136.0.1188465592]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MacroPlan
+ {
+ #keys: '3[415136.0.1188465594][415136.0.1188465593][415136.0.1188465595]'
+ Cardinality: '0to1'
+ ObjectDefinition: ProductPower
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide ProductPower
+ {
+ #keys: '3[415136.0.1188465597][415136.0.1188465596][415136.0.1188465598]'
+ Cardinality: '1toN'
+ ObjectDefinition: MacroPlan
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index 6c48d50..a2c55cc 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -3,7 +3,7 @@
StaticMethod GenerateData (
InterfaceDataset owner,
String werk,
- const MacroPlan macroplan,
+ String version,
Date startdate,
Date enddate,
String executor
@@ -33,41 +33,43 @@
, ReturnMsg := 'Success'
, Success := true
);
- pir := owner.AOnlineAndMOfflinePlanPIR( relnew, ZPPPSCode := OS::GenerateGUIDAsString(), Werk := werk, Version := macroplan.ScenarioName(), StartDate := startdate, EndDate := enddate );
+ pir := owner.AOnlineAndMOfflinePlanPIR( relnew, ZPPPSCode := OS::GenerateGUIDAsString(), Werk := werk, Version := version, StartDate := startdate, EndDate := enddate );
loginfo.AOnlineAndMOfflinePlanPIR( relinsert, pir );
- traverse( macroplan, AssemblyOnlinePlanColumn, column, column.ColumnDate() >= startdate and column.ColumnDate() <= enddate ){
- traverse( column, AssemblyOnlinePlanCell, cell, ( werk = 'All' or cell.AssemblyOnlinePlanRow().ProductionLine().FindString( werk, 0 ) > -1 )
- and cell.AssemblyOnlinePlanRow().Type() = '1' ){
- quantityrow := cell.AssemblyOnlinePlanRow();
- if( not exists( productids, Elements, e, e = quantityrow.ProductID() ) ){
- productids.Add( quantityrow.ProductID() );
- }
-
- pir.PIRData( relnew, Product := quantityrow.ProductID()
- , PlanningDate := column.ColumnDate()
- , PlanningQty := [Number]cell.Value());
- }
- }
-
- traverse( macroplan, OfflinePlanTable, table ){
- traverse( table, OfflinePlanColumn, column, column.ColumnDate() >= startdate and column.ColumnDate() <= enddate ){
- traverse( column, OfflinePlanCell, cell, ( werk = 'All' or cell.OfflinePlanRow().ProductionLine().FindString( werk, 0 ) > -1 )
- and ( cell.OfflinePlanRow().ProductionLine() <> 'DL_MOMO' or cell.OfflinePlanRow().ProductionLine() <> 'CC_MOMO' )
- and cell.OfflinePlanRow().Type() = '1' ){
- row := cell.OfflinePlanRow();
- if( not exists( productids, Elements, e, e = row.ProductID() ) ){
- productids.Add( row.ProductID() );
+ traverse( owner, AssemblyOnlinePlanVersion, verison, not verison.IsShow() ){
+ traverse( verison, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() >= startdate and column.StartDate() <= enddate ){
+ traverse( column, Cell, cell, ( werk = 'All' or cell.Row().ProductionLine().FindString( werk, 0 ) > -1 )
+ and cell.Row().Type() = '1' ){
+ quantityrow := cell.Row();
+ if( not exists( productids, Elements, e, e = quantityrow.ProductID() ) ){
+ productids.Add( quantityrow.ProductID() );
}
- pirdata := selectobject( pir, PIRData, pirdata, pirdata.Product() = row.ProductID() and pirdata.PlanningDate() = column.ColumnDate() );
- if( isnull( pirdata ) ){
- pirdata := pir.PIRData( relnew, Product := row.ProductID()
- , PlanningDate := column.ColumnDate()
- , PlanningQty := 0 );
- }
- pirdata.PlanningQty( pirdata.PlanningQty() + [Number]cell.Value() );
+
+ pir.PIRData( relnew, Product := quantityrow.ProductID()
+ , PlanningDate := column.StartDate()
+ , PlanningQty := [Number]cell.Value());
}
}
}
+
+ //traverse( version, OfflinePlanTable, table ){
+ // traverse( table, OfflinePlanColumn, column, column.ColumnDate() >= startdate and column.ColumnDate() <= enddate ){
+ // traverse( column, OfflinePlanCell, cell, ( werk = 'All' or cell.OfflinePlanRow().ProductionLine().FindString( werk, 0 ) > -1 )
+ // and ( cell.OfflinePlanRow().ProductionLine() <> 'DL_MOMO' or cell.OfflinePlanRow().ProductionLine() <> 'CC_MOMO' )
+ // and cell.OfflinePlanRow().Type() = '1' ){
+ // row := cell.OfflinePlanRow();
+ // if( not exists( productids, Elements, e, e = row.ProductID() ) ){
+ // productids.Add( row.ProductID() );
+ // }
+ // pirdata := selectobject( pir, PIRData, pirdata, pirdata.Product() = row.ProductID() and pirdata.PlanningDate() = column.ColumnDate() );
+ // if( isnull( pirdata ) ){
+ // pirdata := pir.PIRData( relnew, Product := row.ProductID()
+ // , PlanningDate := column.ColumnDate()
+ // , PlanningQty := 0 );
+ // }
+ // pirdata.PlanningQty( pirdata.PlanningQty() + [Number]cell.Value() );
+ // }
+ // }
+ //}
traverse( productids, Elements, e ){
for( date := startdate.StartOfWeek(); date <= enddate; date := ( date + Duration::Days( 1 ) ).Date() ){
if( not exists( pir, PIRData, pirdata, pirdata.Product() = e and pirdata.PlanningDate() = date ) ){
diff --git a/_Main/BL/Type_AssemblyOnlinePlanCell0/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanCell0/StaticMethod_RefreshData.qbl
deleted file mode 100644
index 457a74f..0000000
--- a/_Main/BL/Type_AssemblyOnlinePlanCell0/StaticMethod_RefreshData.qbl
+++ /dev/null
@@ -1,36 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod RefreshData (
- MacroPlan macroPlan,
- OfflinePlanTable opt
-)
-{
- TextBody:
- [*
- macroPlan.AssemblyOnlinePlanRow( relflush );
- macroPlan.AssemblyOnlinePlanColumn( relflush );
-
- // 鎵捐閰嶇嚎琛�
- oprs := selectsortedset( opt, OfflinePlanRow, tempOPR, tempOPR.ProductionLine() = "DL-MoMo" or tempOPR.ProductionLine() = "CC-MoMo", tempOPR.ProductionLine(), tempOPR.ProductID(), tempOPR.Type() );
- opcs := selectsortedset( opt, OfflinePlanColumn, tempOPC, true, tempOPC.ColumnDate() );
-
- // 鐢熸垚琛ㄦ牸
- traverse ( opcs, Elements, opc ) {
- aopc := macroPlan.AssemblyOnlinePlanColumn( relnew, ColumnDate := opc.ColumnDate(), ColumnIndex := opc.ColumnIndex() );
- traverse ( oprs, Elements, opr ) {
- aopr := select( macroPlan, AssemblyOnlinePlanRow, tempAOPR, tempAOPR.ProductID() = opr.ProductID() and tempAOPR.ProductionLine() = opr.ProductionLine() and tempAOPR.Type() = opr.Type() );
- if ( isnull( aopr ) ) {
- aopr := macroPlan.AssemblyOnlinePlanRow( relnew, ProductID := opr.ProductID(), ProductionLine := opr.ProductionLine(), Type := opr.Type() );
- }
-
- cellOPC := select( opr, OfflinePlanCell, tempOPC, tempOPC.OfflinePlanColumn() = opc );
- if ( not isnull( cellOPC ) ) {
- cellAOPC := aopc.AssemblyOnlinePlanCell( relnew, Value := cellOPC.Value() );
- cellAOPC.AssemblyOnlinePlanRow( relset, aopr );
- }
- }
- }
-
- // 澶勭悊鏃ュ巻浜嬩欢
- *]
-}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_ColumnDate.qbl b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_ColumnDate.qbl
deleted file mode 100644
index b0847b4..0000000
--- a/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_ColumnDate.qbl
+++ /dev/null
@@ -1,7 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute ColumnDate
-{
- #keys: '3[415136.0.1174730129][415136.0.1174730128][415136.0.1174730130]'
- ValueType: Date
-}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_EndDate.qbl b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_EndDate.qbl
new file mode 100644
index 0000000..e6452cc
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_EndDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[415136.0.1184120166][415136.0.1184120165][415136.0.1184120167]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_StartDate.qbl b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_StartDate.qbl
new file mode 100644
index 0000000..c463f8c
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_StartDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[415136.0.1184120156][415136.0.1184120155][415136.0.1184120157]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_TimeUnit.qbl b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_TimeUnit.qbl
new file mode 100644
index 0000000..64a3f83
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanColumn0/Attribute_TimeUnit.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute TimeUnit
+{
+ #keys: '3[415136.0.1184120146][415136.0.1184120145][415136.0.1184120147]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_ID.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_ID.qbl
new file mode 100644
index 0000000..56650e3
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_ID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ID
+{
+ #keys: '3[415136.0.1184170976][415136.0.1184170975][415136.0.1184170977]'
+ IsReadOnly: true
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_IsShow.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_IsShow.qbl
new file mode 100644
index 0000000..fe07e2e
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_IsShow.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsShow
+{
+ #keys: '3[415136.0.1184120223][415136.0.1184120222][415136.0.1184120224]'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_Name.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_Name.qbl
new file mode 100644
index 0000000..4c79acc
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Attribute_Name.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Name
+{
+ #keys: '3[415136.0.1184170979][415136.0.1184170978][415136.0.1184170980]'
+ Description: '鍚嶇О'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_ID.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_ID.qbl
new file mode 100644
index 0000000..049abc0
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_ID.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: ID
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_Name.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_Name.qbl
new file mode 100644
index 0000000..86c3d59
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/DefaultValue_Name.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Name
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GenerateColumn.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GenerateColumn.qbl
new file mode 100644
index 0000000..92c1367
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GenerateColumn.qbl
@@ -0,0 +1,65 @@
+Quintiq file version 2.0
+#parent: #root
+Method GenerateColumn (
+ Dates periods,
+ String timeunit,
+ Date starttime,
+ Date endtime
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-25-2024 (created)
+ mindate := min( periods, Elements, period, period );
+ maxdate := max( periods, Elements, period, period );
+ //鏌ヨ鏃ユ湡杩斿洖闇�瑕佸湪璁″垝鏃ユ湡涔嬪唴
+ if( starttime < mindate and endtime > maxdate ){
+ if( starttime < mindate ){
+ starttime := mindate;
+ }
+ if( endtime > maxdate ){
+ endtime := maxdate;
+ }
+ if( timeunit = Translations::MP_GlobalParameters_Day() ){
+ for( start := starttime; start <= endtime; start := start.DateTime().StartOfNextDay().Date() ){
+ periodname := start.Format( "M2/D2/Y" );
+ if( not exists( this, Column, column, column.StartDate() = start ) ){
+ this.Column( relnew, ColumnName := periodname, StartDate := start, EndDate := start, TimeUnit := Translations::MP_GlobalParameters_Day() );
+ }
+ }
+ }else if( timeunit = Translations::MP_GlobalParameters_Week() ){
+ // weekstartstr := ' KW';
+ for( start := starttime; start <= endtime; start := start.StartOfNextWeek() ){
+ weekend := ( start.StartOfNextWeek() - Duration::Days( 1 ) ).Date();//.Concat( weekstartstr.Concat( weekend.Week().Format( 'N(LPad0(2))' ) ) )
+
+ this.Column( relnew, ColumnName := weekend.Format( "M2/D2/Y" ), StartDate := start, EndDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
+ }
+ }else if( timeunit = Translations::MP_GlobalParameters_Month() ){
+ for( start := starttime; start <= endtime; start := start.StartOfNextMonth() ){
+ monthend := ( start.StartOfNextMonth() - Duration::Days( 1 ) ).Date();//.Concat( ' ' ).Concat( monthend.Format( "MM", us_locale ).Concat( '/').Concat( [String]monthend.Month() ).Concat( '鏈�' ) )
+ // us_locale := Locale::Construct( 'en_us' );
+ this.Column( relnew, ColumnName := monthend.Format( "M2/D2/Y" ), StartDate := start, EndDate := monthend, TimeUnit := Translations::MP_GlobalParameters_Month() );
+ }
+ }
+ }
+ //weekstart := periods.Element( 0 );
+ //monthstart := periods.Element( 0 );
+ //traverse( periods, Elements, periodtime ){
+ // periodname := periodtime.Format( "M2/D2/Y" );
+ //
+ // this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
+ //
+ // if( periodtime = weekstart ){
+ // weekperiodname := weekstart.Format( "M2/D2/Y" );
+ // this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart + Duration::Days( 6 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
+ // weekstart := ( weekstart + Duration::Days( 7 ) ).Date();
+ // }
+ // if( periodtime = monthstart ){
+ // monthperiodname := monthstart.Format( "M2/D2/Y" );
+ // enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
+ // this.Column( relnew, Name := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
+ // monthstart := monthstart.StartOfNextMonth();
+ // }
+ //}
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetColumnByTimeUnit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetColumnByTimeUnit.qbl
new file mode 100644
index 0000000..1b4a90e
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetColumnByTimeUnit.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+Method GetColumnByTimeUnit (
+ String unit,
+ Date period
+) as AssemblyOnlinePlanVersionColumn
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-7-2024 (created)
+
+ column := selectobject( this, Column, column, column.StartDate() <= period and column.EndDate() >= period and column.TimeUnit() = unit );
+
+ return column;
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
new file mode 100644
index 0000000..8e5337b
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: #root
+Method GetRow (
+ const AssemblyOnlinePlanRow aoprow
+) as AssemblyOnlinePlanVersionRow
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Oct-11-2024 (created)
+ row := selectobject( this, Row, row, row.ProductID() = aoprow.ProductID() and row.ProductionLine() = aoprow.ProductionLine() and row.Type() = aoprow.Type() );
+
+ if( isnull( row ) ){
+ row := this.Row( relnew, ProductID := aoprow.ProductID(), ProductionLine := aoprow.ProductionLine(), Type := aoprow.Type() );
+ //鍒濆鍖栧崟鍏冩牸
+ row.InitializeCell();
+ }
+
+ return row;
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl
new file mode 100644
index 0000000..0cbe54d
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GenerateData.qbl
@@ -0,0 +1,62 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GenerateData (
+ InterfaceDataset interface,
+ RecycleBin recycle,
+ const Archive archive
+)
+{
+ Description: '鐢熸垚鍙互涓嬪彂鐨勫鎴烽渶姹傦紙PPA+IDS锛夋暟鎹�'
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-20-2024 (created)
+ interface.CustomerDemandIDS( relflush );
+ interface.CustomerDemandIDSSearch( relflush );
+ allunit := CustomerDemandIDS::GetDefaultAllUnit();
+ interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
+ idstable := interface.CustomerDemandIDS( relnew, ID := '瀹㈡埛闇�姹�', Name := '瀹㈡埛闇�姹�' );
+ binaryValue := TemplateManager::GetIDSFullTable( archive, Date::ActualDate().Year() );
+ source := GeneralExcelImportAndExportDataSource::Upload( recycle, binaryValue, OS::TempPath() + "template.xlsx" );
+ source.ReadStructure();
+ Transaction::Transaction().Propagate( attribute( GeneralExcelImportAndExportDataColumn, ColumnIndex ) );
+ cnv2 := StringToDate::StandardConverter();
+ cnv2.SetCustomConversion();
+ cnv2.CustomFormatString( "yyyy/MM/dd" );
+ idsdates := selectuniquevalues( source, GeneralExcelImportAndExportDataTable.GeneralExcelImportAndExportDataColumn, column, column.ColumnIndex() > 2, cnv2.Convert( column.Name() ) );
+ ppadates := selectuniquevalues( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA', forecast.Date() );
+ //ppadates := construct( Dates );
+ //traverse( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA' ){
+ // ppadates := ppadates.Union( selectuniquevalues( forecast, PlanningSalesDemandInPeriod, salesdemand, salesdemand.StartDate() ) );
+ //}
+ periods := idsdates.Union( ppadates );
+ periods := selectuniquevalues( periods, Elements, e, e );
+ idstable.GenerateColumn( periods.Sort() );
+ traverse( recycle, GeneralExcelImportAndExportDataSource.GeneralExcelImportAndExportDataTable, table ){
+ traverse( table, GeneralExcelImportAndExportDataRow, row ){
+ productcell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 2 );
+ factorycell := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 0 );
+ idsrow := idstable.GetRowByUnit( productcell.Value(), factorycell.Value() );
+ traverse( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() > 2 ){
+ period := cnv2.Convert( cell.GeneralExcelImportAndExportDataColumn().Name() );
+ daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), period );
+ weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), period );
+ monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), period );
+ idsrow.SetCellValue( daycolumn, [Number]cell.Value() );
+ idsrow.SetCellValue( weekcolumn, [Number]cell.Value() );
+ idsrow.SetCellValue( monthcolumn, [Number]cell.Value() );
+ }
+ }
+ }
+ traverse( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA' ){
+ idsrow := idstable.GetRowByUnit( forecast.PartNumber(), forecast.Factory() );
+ daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), forecast.Date() );
+ weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), forecast.Date() );
+ monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), forecast.Date() );
+ idsrow.SetCellValue( daycolumn, [Number]forecast.Quantity() );
+ idsrow.SetCellValue( weekcolumn, [Number]forecast.Quantity() );
+ idsrow.SetCellValue( monthcolumn, [Number]forecast.Quantity() );
+ }
+
+ source.Delete();
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultAllUnit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultAllUnit.qbl
new file mode 100644
index 0000000..e912c3f
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultAllUnit.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetDefaultAllUnit () const declarative as String
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-25-2024 (created)
+ return '<All>';
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultName.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultName.qbl
new file mode 100644
index 0000000..0193933
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_GetDefaultName.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetDefaultName () const declarative as String
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-25-2024 (created)
+ return '瑁呴厤涓婄嚎璁″垝鍏ㄩ噺琛�';
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
new file mode 100644
index 0000000..a22c383
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
@@ -0,0 +1,38 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod RefreshData (
+ InterfaceDataset interface,
+ const MacroPlan macroPlan
+)
+{
+ TextBody:
+ [*
+ //鏍规嵁褰撳墠鐗堟湰鐨勮閰嶄笂绾胯鍒�
+ allunit := AssemblyOnlinePlanVersion::GetDefaultAllUnit();
+ name := AssemblyOnlinePlanVersion::GetDefaultName();
+ search := interface.AssemblyOnlinePlanVersionSearch( relnew, Product := allunit, ProductionLine := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+ table := selectobject( interface, AssemblyOnlinePlanVersion, version, not version.IsShow() );
+ if( isnull( table ) ){
+ table := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name );
+ }
+ showtable := selectobject( interface, AssemblyOnlinePlanVersion, version, version.IsShow() );
+ if( isnull( table ) ){
+ showtable := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true );
+ }
+ aopcolumns := selectuniquevalues( macroPlan, AssemblyOnlinePlanColumn, aopcolumn, not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcolumn.ColumnDate() ), aopcolumn.ColumnDate() );
+ table.GenerateColumn( aopcolumns, search.TimeUnit(), search.StartDate(), search.EndDate() );
+ traverse( macroPlan, AssemblyOnlinePlanRow, aoprow ){
+ row := table.GetRow( aoprow );
+ traverse( aoprow, AssemblyOnlinePlanCell, aopcell ){
+ column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcell.AssemblyOnlinePlanColumn().ColumnDate() );
+ cell := selectobject( row, Cell, cell, cell.Column() = column );
+ cell.InventoryWeight( aopcell.InventoryWeight() );
+ cell.ProductionSerialNumber( aopcell.ProductionSerialNumber() );
+ cell.Quantity( aopcell.Quantity() );
+ cell.Shift( aopcell.Shift() );
+ cell.Value( aopcell.Value() );
+ }
+ }
+ //showtable.Generate( search, products );
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/_ROOT_Type_AssemblyOnlinePlanVersion.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/_ROOT_Type_AssemblyOnlinePlanVersion.qbl
new file mode 100644
index 0000000..e97100f
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/_ROOT_Type_AssemblyOnlinePlanVersion.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type AssemblyOnlinePlanVersion
+{
+ #keys: '5[415136.0.1184170973][415136.0.1184170971][0.0.0][415136.0.1184170972][415136.0.1184170974]'
+ BaseType: Object
+ Description: '瑁呴厤涓婄嚎璁″垝鍏ㄨ〃鏁版嵁'
+ StructuredName: 'AssemblyOnlinePlanVersions'
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_Initialize.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_Initialize.qbl
new file mode 100644
index 0000000..d56bd69
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_Initialize.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Method Initialize (
+ AssemblyOnlinePlanVersionColumn column
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-24-2024 (created)
+ cell := column.Cell( relnew, InventoryWeight := 0, ProductionSerialNumber := 0, Quantity := 0, Shift := '', Value := '' );
+
+ this.Cell( relinsert, cell );
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_InitializeCell.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_InitializeCell.qbl
new file mode 100644
index 0000000..68b1fd4
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Method_InitializeCell.qbl
@@ -0,0 +1,12 @@
+Quintiq file version 2.0
+#parent: #root
+Method InitializeCell
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-28-2024 (created)
+ traverse( this.Version(), Column, column ){
+ this.Initialize( column );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_EndDate.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_EndDate.qbl
new file mode 100644
index 0000000..15f2999
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_EndDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[415136.0.1184120182][415136.0.1184120181][415136.0.1184120183]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Product.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Product.qbl
new file mode 100644
index 0000000..483a49a
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Product.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.1184120194][415136.0.1184120193][415136.0.1184120195]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_ProductionLine.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_ProductionLine.qbl
new file mode 100644
index 0000000..e30701a
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_ProductionLine.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductionLine
+{
+ #keys: '3[415136.0.1184120240][415136.0.1184120239][415136.0.1184120241]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_StartDate.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_StartDate.qbl
new file mode 100644
index 0000000..229b77e
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_StartDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[415136.0.1184120197][415136.0.1184120196][415136.0.1184120198]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_TimeUnit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_TimeUnit.qbl
new file mode 100644
index 0000000..dcece4b
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_TimeUnit.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute TimeUnit
+{
+ #keys: '3[415136.0.1184120200][415136.0.1184120199][415136.0.1184120201]'
+ Description: '鏃ユ湡绫诲瀷'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Unit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Unit.qbl
new file mode 100644
index 0000000..4ee17c5
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/Attribute_Unit.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Unit
+{
+ #keys: '3[415136.0.1184120203][415136.0.1184120202][415136.0.1184120204]'
+ Description: '浜х嚎'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Product.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Product.qbl
new file mode 100644
index 0000000..6e10c8e
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Product.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Product
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_TimeUnit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_TimeUnit.qbl
new file mode 100644
index 0000000..e29979e
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_TimeUnit.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: TimeUnit
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Unit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Unit.qbl
new file mode 100644
index 0000000..7e60e2c
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/DefaultValue_Unit.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Unit
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/_ROOT_Type_AssemblyOnlinePlanVersionSearch.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/_ROOT_Type_AssemblyOnlinePlanVersionSearch.qbl
new file mode 100644
index 0000000..14ab4a2
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionSearch/_ROOT_Type_AssemblyOnlinePlanVersionSearch.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type AssemblyOnlinePlanVersionSearch
+{
+ #keys: '5[415136.0.1184120179][415136.0.1184120177][0.0.0][415136.0.1184120178][415136.0.1184120180]'
+ BaseType: Object
+ Description: '鏌ヨ绫�'
+ StructuredName: 'AssemblyOnlinePlanVersionSearchs'
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_Coefficient.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_Coefficient.qbl
deleted file mode 100644
index ffd2fc1..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_Coefficient.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Coefficient
-{
- #keys: '3[415136.0.986844758][415136.0.986844757][415136.0.986844759]'
- Description: '绯绘暟'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_CoefficientValue.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_CoefficientValue.qbl
new file mode 100644
index 0000000..f12883c
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_CoefficientValue.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CoefficientValue
+{
+ #keys: '3[415136.0.1188511347][415136.0.1188511346][415136.0.1188511348]'
+ Description: '绯绘暟'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl
index 105f146..c23582b 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl
@@ -6,7 +6,7 @@
TextBody:
[*
// 鐢勫叞楦� Aug-12-2024 (created)
- value := this.EstimateTotalCost() * this.Coefficient();
+ value := this.EstimateTotalCost() * [Real]this.CoefficientValue();
this.AllCost( value );
*]
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_Coefficient.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_Coefficient.qbl
deleted file mode 100644
index 78e30c4..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_Coefficient.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute Coefficient
-{
- #keys: '3[415136.0.992900036][415136.0.992900035][415136.0.992900037]'
- Description: '绯绘暟'
- ValueType: Number
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CoefficientValue.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CoefficientValue.qbl
new file mode 100644
index 0000000..32be312
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CoefficientValue.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CoefficientValue
+{
+ #keys: '3[415136.0.1188511356][415136.0.1188511355][415136.0.1188511357]'
+ Description: '绯绘暟'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl
index 105f146..c23582b 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostCell0/Function_CalcAllCost.qbl
@@ -6,7 +6,7 @@
TextBody:
[*
// 鐢勫叞楦� Aug-12-2024 (created)
- value := this.EstimateTotalCost() * this.Coefficient();
+ value := this.EstimateTotalCost() * [Real]this.CoefficientValue();
this.AllCost( value );
*]
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index 4ac90f8..f5a173d 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -12,32 +12,43 @@
allunit := '<All>';
//娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
this.Clear();
+ //骞存眹鎬�
+ yearcolumn := this.Column( relnew, Name := '姹囨��', StartDate := search.MacroPlan().StartOfPlanning().StartOfNextYear().Date() );
//杩囨护鍚庣殑浜у搧id
productids := selectuniquevalues( products, Elements, product, ( search.Generation() = allunit or product.Generation() = search.Generation() )
and ( search.MqbMlb() = allunit or product.MQBMLB() = search.MqbMlb() )
and ( search.Power() = allunit or product.Power() = search.Power() ), product.ID() );
sumrow := this.Row( relnew, Name := 'SUM', RowNr := table.Row( relsize ) );
+ sumyearcell := sumrow.Initialize( yearcolumn );
traverse( table, Row, row ){
productid := construct( Strings );
productid.Add( row.Name() );
if( productids.ContainsAll( productid ) ){
showrow := this.Row( relnew, Name := row.Name(), RowNr := row.RowNr() );
+ yearcell := showrow.Initialize( yearcolumn );
traverse( row, Cell, cell ){
column := selectobject( this, Column, column, column.Name() = cell.Column().Name() );
sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
if( isnull( sumcell ) ){
- sumcell := sumrow.Cell( relnew, RentInCost := 0
- , RentOutOfCost := 0
- , WerkToRentTransCost := 0
- , RentStorCost := 0 );
- column.Cell( relinsert, sumcell );
+ sumcell := sumrow.Initialize( column );
}
-
+ //鏄剧ず鏈堝崟鍏冩牸
showcell := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost() );
column.Cell( relinsert, showcell );
+ //鏄剧ず骞村崟鍏冩牸
+ yearcell.RentInCost( cell.RentInCost() + yearcell.RentInCost() );
+ yearcell.RentOutOfCost( cell.RentOutOfCost() + yearcell.RentOutOfCost() );
+ yearcell.WerkToRentTransCost( cell.WerkToRentTransCost() + yearcell.WerkToRentTransCost() );
+ yearcell.RentStorCost( cell.RentStorCost() + yearcell.RentStorCost() );
+ //鏄剧ず鍚堣骞村崟鍏冩牸
+ sumyearcell.RentInCost( cell.RentInCost() + sumyearcell.RentInCost() );
+ sumyearcell.RentOutOfCost( cell.RentOutOfCost() + sumyearcell.RentOutOfCost() );
+ sumyearcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumyearcell.WerkToRentTransCost() );
+ sumyearcell.RentStorCost( cell.RentStorCost() + sumyearcell.RentStorCost() );
+ //鏄剧ず鍚堣鏈堝崟鍏冩牸
sumcell.RentInCost( cell.RentInCost() + sumcell.RentInCost() );
sumcell.RentOutOfCost( cell.RentOutOfCost() + sumcell.RentOutOfCost() );
sumcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumcell.WerkToRentTransCost() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
index 305d174..f724e28 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl
@@ -127,7 +127,7 @@
columnelement.AppendChild( estimatedtotalcostcellElement );
//绯绘暟
coefficientcellElement := xmlDOM.CreateElement( "cell" );
- coefficientcellElement.SetAttribute( "value", c.Coefficient().Format( 'N(Dec)' ) );
+ coefficientcellElement.SetAttribute( "value", c.CoefficientValue() );
columnelement.AppendChild( coefficientcellElement );
//鎬昏垂鐢�
totalcostcellElement := xmlDOM.CreateElement( "cell" );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl
index 3310861..c08efa2 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Import.qbl
@@ -59,7 +59,7 @@
// cell.EstimatedTotalCost( [Number]valuecell.Value() );
// }
else if( attricell.Value() = '绯绘暟' ){
- cell.Coefficient( [Number]valuecell.Value() );
+ cell.CoefficientValue( valuecell.Value() );
}
// else if( attricell.Value() = '鎬昏垂鐢�' ){
// cell.TotalCost( [Number]valuecell.Value() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
index 3f5377f..572e04a 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
@@ -46,8 +46,8 @@
enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= cellcolumn.Period() and engine.EndDate() >= cellcolumn.Period() );
if( not isnull( enginecost ) ){
//鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬闀挎槬浜ч噺
- quantity := ceil( cell.Quantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- column := selectobject( table, Column, column, column.Name() = cell.FinancialProductionColumn().Name() );
+ quantity := ceil( cell.Quantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
+ column := selectobject( table, Column, column, column.Name() = cell.FinancialProductionColumn().Name() );
//澶栫搴撳叆搴撹垂鐢�
ccrow.SetRentEnterCost( column, quantity );
}
@@ -96,34 +96,23 @@
destisp := selectobject( owner, StockingPoint_MP, sp, sp.ID() = laneleg.DestinationStockingPointID() );
isccrent := table.IsInUnit( destisp, ccrent );
if( isccspline and isccrent ){
- traverse( laneleg, Trip, trip, trip.Arrival().Date() < startofnextyear ){
- periodtime := trip.Arrival().StartOfMonth().Date();
- periodname := periodtime.Format( "M2/D2/Y" );
-
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.StartDate() <= trip.Arrival().Date() and engine.EndDate() >= trip.Arrival().Date() );
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.StartDate() <= trip.Arrival().Date() and trans.EndDate() >= trip.Arrival().Date() );
+ traverse( table, Column, column ){
+ alltrips := selectset( laneleg, Trip, trip, trip.Arrival().Date() < column.StartDate().StartOfNextMonth() and trip.Arrival().Date() >= column.StartDate() );
+ enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate() );
+ transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() );
if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
- traverse( trip, ProductInTrip, pit, pit.Quantity() <> 0 ){
- product := pit.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){////鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccfactory );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcost := selectobject( transcosts, Elements, trans, trans.Origin() = 'CC 鍘傚唴搴�'
- and trans.Destination() = ccrent
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
- if( not isnull( enginecost ) and not isnull( transcost ) ){
- row := table.GetRow( pit.ProductID() );
- products.Add( product );
- //杩愯緭鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环
- quantity := ceil( ceil( [Number]pit.Quantity() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
-
- row.SetFactoryToRentTransCost( column, quantity );
- }
+ producttrips := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ), pit.ProductID() );
+ traverse( producttrips, Elements, producttrip ){
+ row := table.GetRow( producttrip );
+ product := selectobject( owner, Product_MP, product, product.ID() = producttrip );
+ products.Add( product );
+ quantity := sum( alltrips, Elements.ProductInTrip, pit, pit.Product_MP() = product, pit.Quantity() );
+ enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower() and engine.MLB_MQB() = product.MQBMLB() and engine.Factory() = ccfactory );
+ //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
+ transcost := selectobject( transcosts, Elements, trans, trans.Origin() = 'CC 鍘傚唴搴�' and trans.Destination() = ccrent and exists( product.GetAllParent(), Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+ if( not isnull( enginecost ) and not isnull( transcost ) ){
+ cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
+ row.SetFactoryToRentTransCost( column, cost );
}
}
}
@@ -131,36 +120,31 @@
}
}
//澶栫搴撲粨鍌ㄨ垂鐢細浠撳偍鏁伴噺/鍖呰瀹归噺*浠撳偍鍗曚环锛屽湪Actual inventories閲屽彇鍒伴暱鏄ュ绉熷簱璇ュ彂鍔ㄦ満鐨勪粨鍌ㄩ噺锛屾牴鎹彂鍔ㄦ満鍙锋壘鍒板搴旂殑Generation 鍜屾í绾靛埗锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃閲屾壘鍒板搴旂殑浠撳偍鍗曚环鍜屽寘瑁呭閲忥紝鐢ㄥ叕寮忚绠楋紝鏈堝害杩涜姹囨��
- traverse( owner, StockingPoint_MP, stockingpoint ){
- //鏄惁灞炰簬闀挎槬澶栫搴�
- isccrent := table.IsInUnit( stockingpoint, ccrent );
- if( isccrent ){
- traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ) ){
- //鑾峰彇琛�
- product := pisp.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){////鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccfactory );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- row := table.GetRow( pisp.ProductID() );
- products.Add( product );
- //褰損roduct planning鐨勬棩鏈熷尯闂村湪闇�瑕佺殑鏃ユ湡鍖洪棿鍐�
- traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ){
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date() );
- if( not isnull( enginecost ) ){
- periodtime := pispip.Start().StartOfMonth().Date();
- periodname := periodtime.Format( "M2/D2/Y" );
- quantity := ceil( [Number]pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
+ traverse( owner, StockingPoint_MP, stockingpoint, table.IsInUnit( stockingpoint, ccrent ) ){//鏄惁灞炰簬闀挎槬澶栫搴�
+ traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent )//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
+ and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.PlannedInventoryLevelEnd() <> 0 ) ){
+ //鑾峰彇琛�
+ product := pisp.Product_MP();
+ //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
+ enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower() and engine.MLB_MQB() = product.MQBMLB()and engine.Factory() = ccfactory );
+ if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
+ row := table.GetRow( pisp.ProductID() );
+ products.Add( product );
+ //褰損roduct planning鐨勬棩鏈熷尯闂村湪闇�瑕佺殑鏃ユ湡鍖洪棿鍐�
+ // traverse( table, Column, column ){
+ // pispips := selectset( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.PlannedInventoryLevelEnd() <> 0
+ // and pispip.Start().Date() < column.StartDate().StartOfNextMonth() and pispip.Start().Date() >= column.StartDate() );
+
+ traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.PlannedInventoryLevelEnd() <> 0 ){
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date() );
+ if( not isnull( enginecost ) ){
+ periodtime := pispip.Start().StartOfMonth().Date();
+ periodname := periodtime.Format( "M2/D2/Y" );
+ quantity := ceil( pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
+ column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- row.SetRentStorageCost( column, quantity );
- }
- }
+ row.SetRentStorageCost( column, quantity );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
index 5dab725..b6b3d79 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
@@ -12,35 +12,30 @@
allunit := '<All>';
//娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
this.Clear();
+ //骞存眹鎬�
+ yearcolumn := this.Column( relnew, Name := '姹囨��', StartDate := search.MacroPlan().StartOfPlanning().StartOfNextYear().Date() );
//杩囨护鍚庣殑浜у搧id
productids := selectuniquevalues( products, Elements, product, ( search.Generation() = allunit or product.Generation() = search.Generation() )
and ( search.MqbMlb() = allunit or product.MQBMLB() = search.MqbMlb() )
and ( search.Power() = allunit or product.Power() = search.Power() ), product.ID() );
sumrow := this.Row( relnew, Name := 'SUM', RowNr := table.Row( relsize ) );
+ sumyearcell := sumrow.Initialize( yearcolumn );
traverse( table, Row, row ){
productid := construct( Strings );
productid.Add( row.Name() );
if( productids.ContainsAll( productid ) ){
showrow := this.Row( relnew, Name := row.Name(), RowNr := row.RowNr() );
+ yearcell := showrow.Initialize( yearcolumn );
traverse( row, Cell, cell ){
column := selectobject( this, Column, column, column.Name() = cell.Column().Name() );
sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
if( isnull( sumcell ) ){
- sumcell := sumrow.Cell( relnew, CCRentInCost := 0
- , CCRentOutOfCost := 0
- , CCLongTransCost := 0
- , CCShorTransCost := 0
- , CCRentStorCost := 0
- , DLRentInCost := 0
- , DLRentOutOfCost := 0
- , WerkToDLRentTransCost := 0
- , DLRentStorCost := 0 );
- column.Cell( relinsert, sumcell );
+ sumcell := sumrow.Initialize( column );
}
-
+ //鏄剧ず鏈堝崟鍏冩牸
showcell := showrow.Cell( relnew, CCRentInCost := cell.CCRentInCost()
, CCRentOutOfCost := cell.CCRentOutOfCost()
, CCLongTransCost := cell.CCLongTransCost()
@@ -51,6 +46,27 @@
, WerkToDLRentTransCost := cell.WerkToDLRentTransCost()
, DLRentStorCost := cell.DLRentStorCost() );
column.Cell( relinsert, showcell );
+ //鏄剧ず骞村崟鍏冩牸
+ yearcell.CCRentInCost( cell.CCRentInCost() + yearcell.CCRentInCost() );
+ yearcell.CCRentOutOfCost( cell.CCRentOutOfCost() + yearcell.CCRentOutOfCost() );
+ yearcell.CCLongTransCost( cell.CCLongTransCost() + yearcell.CCLongTransCost() );
+ yearcell.CCShorTransCost( cell.CCShorTransCost() + yearcell.CCShorTransCost() );
+ yearcell.CCRentStorCost( cell.CCRentStorCost() + yearcell.CCRentStorCost() );
+ yearcell.DLRentInCost( cell.DLRentInCost() + yearcell.DLRentInCost() );
+ yearcell.DLRentOutOfCost( cell.DLRentOutOfCost() + yearcell.DLRentOutOfCost() );
+ yearcell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + yearcell.WerkToDLRentTransCost() );
+ yearcell.DLRentStorCost( cell.DLRentStorCost() + yearcell.DLRentStorCost() );
+ //鏄剧ず鍚堣骞村崟鍏冩牸
+ sumyearcell.CCRentInCost( cell.CCRentInCost() + sumyearcell.CCRentInCost() );
+ sumyearcell.CCRentOutOfCost( cell.CCRentOutOfCost() + sumyearcell.CCRentOutOfCost() );
+ sumyearcell.CCLongTransCost( cell.CCLongTransCost() + sumyearcell.CCLongTransCost() );
+ sumyearcell.CCShorTransCost( cell.CCShorTransCost() + sumyearcell.CCShorTransCost() );
+ sumyearcell.CCRentStorCost( cell.CCRentStorCost() + sumyearcell.CCRentStorCost() );
+ sumyearcell.DLRentInCost( cell.DLRentInCost() + sumyearcell.DLRentInCost() );
+ sumyearcell.DLRentOutOfCost( cell.DLRentOutOfCost() + sumyearcell.DLRentOutOfCost() );
+ sumyearcell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + sumyearcell.WerkToDLRentTransCost() );
+ sumyearcell.DLRentStorCost( cell.DLRentStorCost() + sumyearcell.DLRentStorCost() );
+ //鏄剧ず鍚堣鏈堝崟鍏冩牸
sumcell.CCRentInCost( cell.CCRentInCost() + sumcell.CCRentInCost() );
sumcell.CCRentOutOfCost( cell.CCRentOutOfCost() + sumcell.CCRentOutOfCost() );
sumcell.CCLongTransCost( cell.CCLongTransCost() + sumcell.CCLongTransCost() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
index dae30bc..04d5dbc 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Download.qbl
@@ -187,7 +187,7 @@
columnelement.AppendChild( estimatedtotalcostcellElement );
//绯绘暟
coefficientcellElement := xmlDOM.CreateElement( "cell" );
- coefficientcellElement.SetAttribute( "value", c.Coefficient().Format( 'N(Dec)' ) );
+ coefficientcellElement.SetAttribute( "value", c.CoefficientValue() );
columnelement.AppendChild( coefficientcellElement );
//鎬昏垂鐢�
totalcostcellElement := xmlDOM.CreateElement( "cell" );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl
index 78e94e9..318e4b7 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl
@@ -69,7 +69,7 @@
// cell.EstimatedTotalCost( [Number]valuecell.Value() );
// }
else if( attricell.Value() = '绯绘暟' ){
- cell.Coefficient( [Number]valuecell.Value() );
+ cell.CoefficientValue( valuecell.Value() );
}
// else if( attricell.Value() = '鎬昏垂鐢�' ){
// cell.TotalCost( [Number]valuecell.Value() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
deleted file mode 100644
index fe1aaa7..0000000
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
+++ /dev/null
@@ -1,285 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod Initialize (
- MacroPlan owner
-)
-{
- TextBody:
- [*
- // 鐢勫叞楦� Aug-12-2024 (created)
- owner.DLEngineLogisticsCostReport( relflush );
- produtparent := DLEngineLogisticsCostReport::GetDefaultProductParent();
- name := DLEngineLogisticsCostReport::GetDefaultName();
- allunit := DLEngineLogisticsCostReport::GetDefaultAllUnit();
- ccunit := DLEngineLogisticsCostReport::GetDefaultCCUnit();
- dlunit := DLEngineLogisticsCostReport::GetDefaultDLUnit();
- dlline := DLEngineLogisticsCostReport::GetStockingPointDLLine();
- ccrent := DLEngineLogisticsCostReport::GetStockingPointCCRent();
- dlrent := DLEngineLogisticsCostReport::GetStockingPointCCRent();
-
- startofplanning := owner.StartOfPlanning().Date();
- //startofyear := startofplanning.StartOfYear();
- startofnextyear := startofplanning.StartOfNextYear();
-
- table := owner.DLEngineLogisticsCostReport( relnew, ID := name, Name := name );
- showtable := owner.DLEngineLogisticsCostReport( relnew, ID := name + 'Show', Name := name, IsShow := true );
- search := owner.DLEngineLogisticsCostSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit );
-
- products := construct( Product_MPs );
-
- table.GenerateColumn( owner );
- //鍙戝線闀挎槬鐨勯攢閲忛渶瑕佸湪trip plan閲岄潰鎵惧埌璧峰搴撳瓨鐐逛负澶ц繛瑁呴厤绾胯竟搴擄紝鐩殑鍦颁负闀挎槬澶栫搴撶殑浜у搧 绠楀嚭鍙戝線闀挎槬鐨勯攢閲忓悗锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃閲屾壘鍒板搴旂殑鍖呰瀹归噺鍜岄暱鏄ュ叆搴撳崟浠凤紝鐢ㄥ叕寮忚绠楋紝鏈堝害杩涜姹囨��
- //鍦� trip plan閲屾壘鍒板ぇ杩炶閰嶇嚎杈瑰簱鍒板ぇ杩炲绉熷簱鐨勮繍杈撴暟閲�//澶ц繛鍘傚唴搴撳埌澶栫搴�
- traverse( owner, Unit.Lane.LaneLeg, laneleg ){
- //璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛瑁呴厤绾胯竟搴�
- originsp := selectobject( owner, StockingPoint_MP, sp, sp.ID() = laneleg.OriginStockingPointID() );
- isdlspline := table.IsInUnit( originsp, dlline );
- //鐩殑鍦版槸鍚︽槸闀挎槬澶栫搴�
- destisp := selectobject( owner, StockingPoint_MP, sp, sp.ID() = laneleg.DestinationStockingPointID() );
- isccrent := table.IsInUnit( destisp, ccrent );
- //鐩殑鍦版槸鍚︽槸澶ц繛澶栫搴�
- destisp := selectobject( owner, StockingPoint_MP, sp, sp.ID() = laneleg.DestinationStockingPointID() );
- isdlrent := table.IsInUnit( destisp, dlrent );
- if( isdlspline and ( isccrent or isdlrent ) ){
- traverse( laneleg, Trip, trip, trip.Departure().Date() < startofnextyear ){//鐢变簬闇�瑕佽�冭檻浜у搧杩愯緭lead time锛屾瘡涓湀鐨勬眹鎬绘暟鎹渶瑕佹帹杩熶袱澶╄繘琛岃绠�
- periodtime := trip.Departure().StartOfMonth().Date();
- periodname := periodtime.Format( "M2/D2/Y" );
-
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.StartDate() <= trip.Departure().Date() and engine.EndDate() >= trip.Departure().Date() );
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.StartDate() <= trip.Departure().Date() and trans.EndDate() >= trip.Departure().Date() );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
- traverse( trip, ProductInTrip, pit, pit.Quantity() <> 0 and not isnull( column ) and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- quantity := [Number]pit.Quantity();
- row := table.GetRow( pit.ProductID() );
- product := pit.Product_MP();
- productparents := product.GetAllParent();
- if( isccrent ){//鐩殑鍦版槸闀挎槬澶栫搴�
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit );
- if( not isnull( enginecost ) ){
- products.Add( product );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.CCRentQty( cell.CCRentQty() + quantity );
- //闀挎槬澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环
- entercost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- //闀挎槬澶栫搴撳嚭搴撹垂鐢�: 鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环
- outcost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- cell.CCRentInCost( cell.CCRentInCost() + entercost );
- cell.CCRentOutOfCost( cell.CCRentOutOfCost() + outcost );
- }
- }
- if( isdlrent ){//鐩殑鍦版槸澶ц繛澶栫搴�
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = dlunit );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcost := selectobject( transcosts, Elements, trans, trans.Origin() = laneleg.OriginStockingPointID()
- and trans.Destination() = laneleg.DestinationStockingPointID()
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
- if( not isnull( enginecost ) and not isnull( transcost ) ){
- products.Add( product );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- //杩愯緭鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环
- cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- cell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + cost );
- }
- }
- }
- }
- }
- }
- }
- //澶ц繛澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬澶ц繛宸ュ巶璇ヤ骇鍝佷骇閲忓噺鍘诲彂寰�闀挎槬鐨勬暟閲�-newSupply
- traverse( owner, FinancialProductionSource, source, not source.IsImport() ){//璐㈠姟浜ч噺鎶ヨ〃闈炲鍏�
- traverse( source, FinancialProductionReport, report, not report.IsShow() ){//璐㈠姟浜ч噺鎶ヨ〃涓嶆樉绀�
- traverse( report, FinancialProductionRow, row, row.Unit() = dlunit and exists( row, FinancialProductionCell, cell, cell.Value() <> '0' and cell.FinancialProductionColumn().IsDay() ) ){//璐㈠姟浜ч噺鎶ヨ〃閲岀殑澶ц繛浜ч噺, 涓嶄负0
- product := row.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = dlunit );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( product );
- ccrow := table.GetRow( row.Name() );
- traverse( row, FinancialProductionCell, cell, cell.Value() <> '0' and cell.FinancialProductionColumn().IsDay() ){
- cellcolumn := cell.FinancialProductionColumn();
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= cellcolumn.Period() and engine.EndDate() >= cellcolumn.Period() );
- if( not isnull( enginecost ) ){
- column := selectobject( table, Column, column, column.Name() = cell.FinancialProductionColumn().Name() );
- //澶ц繛澶栫搴撳叆搴撹垂鐢�
- ccrow.SetDLRentEnterCost( column, enginecost, cell );
- }
- }
- }
- }
- }
- }
- }
- //澶ц繛澶栫搴撳嚭搴撹垂鐢細鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环锛屽嚭搴撻噺绛変簬澶ц繛宸ュ巶璇ヤ骇鍝侀攢閲忓噺鍘诲彂寰�闀挎槬鐨勬暟閲�-newSupply, 澶ц繛鍘傚唴搴擄紝澶ц繛澶栫搴�
- traverse( owner, FinancialSalesSource, source, not source.IsImport() ){//璐㈠姟閿�閲忔姤琛ㄩ潪瀵煎叆
- traverse( source, FinancialSalesReport, report, not report.IsShow() ){//璐㈠姟閿�閲忔姤琛ㄤ笉鏄剧ず
- traverse( report, FinancialSalesRow, row, row.Unit() = ccunit and exists( row, FinancialSalesCell, cell, cell.Value() <> '0' and cell.FinancialSalesColumn().IsDay() ) ){//璐㈠姟閿�閲忔姤琛ㄩ噷鐨勫ぇ杩炰骇閲�, 涓嶄负0
- product := row.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = dlunit );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( product );
- ccrow := table.GetRow( row.Name() );
- traverse( row, FinancialSalesCell, cell, cell.Value() <> '0' and cell.FinancialSalesColumn().IsDay() ){
- cellcolumn := cell.FinancialSalesColumn();
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= cellcolumn.Period() and engine.EndDate() >= cellcolumn.Period() );
- if( not isnull( enginecost ) ){
- column := selectobject( table, Column, column, column.Name() = cell.FinancialSalesColumn().Name() );
- //澶ц繛澶栫搴撳嚭搴撹垂鐢�
- ccrow.SetDLRentOutCost( column, enginecost, cell );
- }
- }
- }
- }
- }
- }
- }
- //闀挎槬闀块�旇繍杈撹垂鐢細璋冩嫧鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环锛岃皟鎷ㄨ鍒掗噷鎵惧埌璇ヤ骇鍝佷粠DL鍒癈C鐨勮皟鎷ㄦ暟閲忥紝鍗宠捣濮嬪湴澶ц繛瑁呴厤绾胯竟搴擄紝鐩殑鍦颁负闀挎槬澶栫搴撳搴旂殑杩愯緭鏁伴噺锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃鎵惧埌瀵瑰簲鐨勫寘瑁呭閲忥紝鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲忥紝鐢ㄥ叕寮忚绠楀緱鍑虹粨鏋滐紝鏈堝害杩涜姹囨��
- traverse( owner, TransferPlanRow, tprow ){
- product := selectobject( owner, Product_MP, product, product.ID() = tprow.ProductID() );
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛
- originsp := selectobject( owner, StockingPoint_MP, sp, sp.ID() = tprow.SourceStockpoingPointID() );
- isdl := table.IsInUnit( originsp, dlunit );
- //鐩殑鍦板簱瀛樼偣鏄惁鏄暱鏄�
- destisp := selectobject( owner, StockingPoint_MP, sp, sp.ID() = tprow.TargetStockpoingPointID() );
- iscc := table.IsInUnit( destisp, ccunit );
- if( isdl and iscc ){
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.Origin() = tprow.SourceStockpoingPointID()
- and trans.Destination() = tprow.TargetStockpoingPointID()
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
- row := table.GetRow( product.ID() );
- products.Add( product );
- traverse( tprow,TransferPlanCell, tpcell, tpcell.TransferPlanColumn().ColumnDate() <> Date::MinDate() and [Number]tpcell.Value() > 0){
- tpcolumndate := tpcell.TransferPlanColumn().ColumnDate();
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= tpcolumndate and engine.EndDate() >= tpcolumndate );
- transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= tpcolumndate and trans.EndDate() >= tpcolumndate );
- if( not isnull( enginecost ) and not isnull( transcost ) ){
- periodtime := tpcolumndate.StartOfMonth();
- periodname := periodtime.Format( "M2/D2/Y" );
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
-
- cost := ceil( ceil( [Number]tpcell.Value() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.CCLongTransCost( cell.CCLongTransCost() + cost );
- }
- }
- }
- }
- }
- }
- //闀挎槬鐭�旇繍杈撹垂鐢細瀹㈡埛闇�姹傛暟閲�/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环锛屽鎴烽渶姹傛暟閲忓彇鑷猣orecast閲宻ales segment涓洪暱鏄ョ殑鏁伴噺姹囨�伙紝鍐嶇敤鍏紡璁＄畻锛屾湀搴﹁繘琛屾眹鎬伙紙鍙栧鎴烽渶姹傛暟閲忔崲绠楁垚杞︽锛�
- traverse( owner, SalesDemand.astype( Forecast ), forecast, forecast.Quantity() > 0 and not isnull( forecast.SalesSegment_MP() ) and forecast.StartDate() < startofnextyear ){
- salessegment := forecast.SalesSegment_MP();
- parentsalessegments := salessegment.GetAllParent();
- //鏄惁灞炰簬闀挎槬
- iscc := salessegment.Name() = ccunit or exists( parentsalessegments, Elements, psalessegment, psalessegment.Name() = ccunit );
- if( iscc ){
- product := forecast.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( forecast.Product_MP() );
- row := table.GetRow( forecast.ProductID() );
- traverse( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() > 0 ){
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= psdip.StartDate() and engine.EndDate() >= psdip.StartDate() );
- if( not isnull( enginecost ) ){
- periodtime := psdip.StartDate().StartOfMonth();
- periodname := periodtime.Format( "M2/D2/Y" );
- // info( '-------------------------', periodname, periodtime );
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- // info( '-------------------------', column.Name() );
- cost := ceil( [Number]psdip.Quantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.CCShorTransCost( cell.CCShorTransCost() + cost );
- }
- }
- }
- }
- }
- }
- //澶栫搴撲粨鍌ㄨ垂鐢細浠撳偍鏁伴噺/鍖呰瀹归噺*浠撳偍鍗曚环锛屽湪Actual inventories閲屽彇鍒伴暱鏄ュ绉熷簱/澶ц繛澶栫搴撹鍙戝姩鏈虹殑浠撳偍閲忥紝鏍规嵁鍙戝姩鏈哄彿鎵惧埌瀵瑰簲鐨凣eneration 鍜屾í绾靛埗锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃閲屾壘鍒板搴旂殑浠撳偍鍗曚环鍜屽寘瑁呭閲忥紝鐢ㄥ叕寮忚绠楋紝鏈堝害杩涜姹囨��
- traverse( owner, StockingPoint_MP, stockingpoint ){
- unit := stockingpoint.Unit();
- parentunits := unit.GetAllParent();
- //鏄惁灞炰簬闀挎槬澶栫搴�
- isccrent := stockingpoint.ID() = ccrent or unit.ID() = ccrent or exists( parentunits, Elements, punit, punit.ID() = ccrent );
- //鏄惁灞炰簬澶ц繛澶栫搴�
- isdlrent := stockingpoint.ID() = dlrent or unit.ID() = dlrent or exists( parentunits, Elements, punit, punit.ID() = dlrent );
- if( isccrent or isdlrent ){
- traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ) ){
- //鑾峰彇琛�
- product := pisp.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- row := table.GetRow( pisp.ProductID() );
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.Generation().ToLower() = product.Generation().ToLower() and engine.MLB_MQB() = product.MQBMLB() );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( pisp.Product_MP() );
- traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ){
- periodtime := pispip.Start().StartOfMonth().Date();
- periodname := periodtime.Format( "M2/D2/Y" );
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
-
- if( isccrent ){
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date()
- and engine.Factory() = ccunit );
- if( not isnull( enginecost ) ){
- cost := ceil( [Number]pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.CCRentStorCost( cell.CCRentStorCost() + cost );
- }
- } else {
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date()
- and engine.Factory() = dlunit );
- if( not isnull( enginecost ) ){
- cost := ceil( [Number]pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.DLRentStorCost( cell.DLRentStorCost() + cost );
- }
- }
- }
- }
- }
- }
- }
- }
- rows := selectsortedset( table, Row, row, row.Name() );
- i := 0;
- traverse( rows, Elements, e ){
- e.RowNr( i );
- i := i + 1;
- }
- info( '-------------------------------------end---------------------------------' );
- //
- showtable.Generate( search, products );
- *]
-}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
index aa66e0d..08b0f6f 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
@@ -11,16 +11,10 @@
produtparent := DLEngineLogisticsCostReport::GetDefaultProductParent();
name := DLEngineLogisticsCostReport::GetDefaultName();
allunit := DLEngineLogisticsCostReport::GetDefaultAllUnit();
- ccunit := DLEngineLogisticsCostReport::GetDefaultCCUnit();
- dlunit := DLEngineLogisticsCostReport::GetDefaultDLUnit();
ccfactory := DLEngineLogisticsCostReport::GetCCFactory();
dlfactory := DLEngineLogisticsCostReport::GetDLFactory();
- //dlline := DLEngineLogisticsCostReport::GetStockingPointDLLine();
- //ccrent := DLEngineLogisticsCostReport::GetStockingPointCCRent();
- //dlrent := DLEngineLogisticsCostReport::GetStockingPointCCRent();
startofplanning := owner.StartOfPlanning().Date();
- //startofyear := startofplanning.StartOfYear();
startofnextyear := startofplanning.StartOfNextYear();
table := owner.DLEngineLogisticsCostReport( relnew, ID := name, Name := name );
@@ -33,57 +27,59 @@
//澶栫搴撲粨鍌ㄨ垂鐢細浠撳偍鏁伴噺/鍖呰瀹归噺*浠撳偍鍗曚环锛屽湪Actual inventories閲屽彇鍒伴暱鏄ュ绉熷簱/澶ц繛澶栫搴撹鍙戝姩鏈虹殑浠撳偍閲忥紝鏍规嵁鍙戝姩鏈哄彿鎵惧埌瀵瑰簲鐨凣eneration 鍜屾í绾靛埗锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃閲屾壘鍒板搴旂殑浠撳偍鍗曚环鍜屽寘瑁呭閲忥紝鐢ㄥ叕寮忚绠楋紝鏈堝害杩涜姹囨��
//闀挎槬澶栫搴撳叆搴�/鍑哄簱璐圭敤锛屽ぇ杩炲彂鍔ㄦ満鐨勯暱鏄ュ绉熷簱鐨凬ew supply
traverse( owner, StockingPoint_MP, stockingpoint, stockingpoint.ID().EndsWith( '澶栫搴�' ) ){
- // unit := stockingpoint.Unit();
- // parentunits := unit.GetAllParent();
- //鏄惁灞炰簬闀挎槬澶栫搴撶敤浜庨暱鏄ュ绉熷簱浠撳偍璐圭敤
- isccrent := stockingpoint.ID().StartsWith( '闀挎槬' ) or stockingpoint.ID().StartsWith( 'CC' );
- //鏄惁灞炰簬澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴撶敤浜庨暱鏄ュ叆搴�/鍑哄簱璐圭敤
isdltoccrent := stockingpoint.ID().StartsWith( '澶ц繛鍙戝姩鏈虹殑闀挎槬' );
- //鏄惁灞炰簬澶ц繛澶栫搴撶敤浜庡ぇ杩炲绉熷簱浠撳偍璐圭敤
- isdlrent := stockingpoint.ID().StartsWith( '澶ц繛' ) or stockingpoint.ID().StartsWith( 'DL' );
- if( isccrent or isdlrent ){
- traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ) ){
+ isdlrent := not isdltoccrent and stockingpoint.ID().StartsWith( '澶ц繛' ) or stockingpoint.ID().StartsWith( 'DL' );
+ if( isdlrent or isdltoccrent){
+ traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
+ and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) ) ){
//鑾峰彇琛�
product := pisp.Product_MP();
productparents := product.GetAllParent();
if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
row := table.GetRow( pisp.ProductID() );
enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower() and engine.MLB_MQB() = product.MQBMLB() );
+ transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
products.Add( pisp.Product_MP() );
- traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ){
+ traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear
+ and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) ){
periodtime := pispip.Start().StartOfMonth().Date();
periodname := periodtime.Format( "M2/D2/Y" );
column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
cell := selectobject( row, Cell, cell, cell.Column() = column );
- if( isccrent or isdltoccrent){
+ if( isdltoccrent){
//鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date()
and engine.Factory() = ccfactory );
- if( not isnull( enginecost ) ){
- if( isccrent ){
- cost := ceil( pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.CCRentStorCost( cell.CCRentStorCost() + cost );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
- }else{
- cell.CCRentQty( cell.CCRentQty() + pispip.NewSupplyQuantity() );
- //闀挎槬澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环
- entercost := ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- //闀挎槬澶栫搴撳嚭搴撹垂鐢�: 鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环
- outcost := ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
- cell.CCRentInCost( cell.CCRentInCost() + entercost );
- cell.CCRentOutOfCost( cell.CCRentOutOfCost() + outcost );
- }
- }
+ cell.CCRentQty( cell.CCRentQty() + pispip.NewSupplyQuantity() );
+ //闀挎槬澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环
+ entercost := ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
+ //闀挎槬澶栫搴撳嚭搴撹垂鐢�: 鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环
+ outcost := ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ cell.CCRentInCost( cell.CCRentInCost() + entercost );
+ cell.CCRentOutOfCost( cell.CCRentOutOfCost() + outcost );
+ cost := ceil( pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
+ cell.CCRentStorCost( cell.CCRentStorCost() + cost );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
+ transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() and trans.Origin() = '闀挎槬澶栫搴�' and trans.Destination() = '瀹㈡埛搴�' );
+ if( not isnull( transcost ) ){
+ cost := ceil( ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
+ cell.CCShorTransCost( cell.CCShorTransCost() + cost );//闀挎槬鐭�旇繍杈撹垂鐢�
+ }
} else {
//鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date()
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date()
and engine.Factory() = dlfactory );
- if( not isnull( enginecost ) ){
- cost := ceil( [Number]pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.DLRentStorCost( cell.DLRentStorCost() + cost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
- }
+ if( not isnull( enginecost ) ){
+ cost := ceil( pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
+ cell.DLRentStorCost( cell.DLRentStorCost() + cost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
+ row.SetDLRentEnterCost( column, enginecost, pispip.NewSupplyQuantity() );//澶ц繛澶栫搴撳叆搴撹垂鐢�
+ transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= pispip.Start().Date() and trans.EndDate() >= pispip.Start().Date() and trans.Origin() = '澶ц繛鍘傚唴搴�' and trans.Destination() = '澶ц繛澶栫搴�' );
+ if( not isnull( transcost ) ){
+ cost := ceil( ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
+ row.SetFactoryToRentTransCost( column, cost );
+ }
+ }
}
}
}
@@ -91,177 +87,134 @@
}
}
}
- //鍦� trip plan閲屾壘鍒板ぇ杩炶閰嶇嚎杈瑰簱鍒板ぇ杩炲绉熷簱鐨勮繍杈撴暟閲�//澶ц繛鍘傚唴搴撳埌澶栫搴�
- traverse( owner, Unit.Lane.LaneLeg, laneleg ){
- //璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛瑁呴厤绾胯竟搴�
- isdlspline := laneleg.OriginStockingPointID().EndsWith( '鍘傚唴搴�' ) and ( laneleg.OriginStockingPointID().StartsWith( '澶ц繛' ) or laneleg.OriginStockingPointID().StartsWith( 'DL' ) );
- //鐩殑鍦版槸鍚︽槸澶ц繛澶栫搴�
- isdlrent := laneleg.DestinationStockingPointID().EndsWith( '澶栫搴�' ) and ( laneleg.DestinationStockingPointID().StartsWith( '澶ц繛' ) or laneleg.DestinationStockingPointID().StartsWith( 'DL' ) );
- if( isdlspline and isdlrent ){
- traverse( laneleg, Trip, trip, trip.Departure().Date() < startofnextyear ){//鐢变簬闇�瑕佽�冭檻浜у搧杩愯緭lead time锛屾瘡涓湀鐨勬眹鎬绘暟鎹渶瑕佹帹杩熶袱澶╄繘琛岃绠�
- periodtime := trip.Departure().StartOfMonth().Date();
- periodname := periodtime.Format( "M2/D2/Y" );
-
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.StartDate() <= trip.Departure().Date() and engine.EndDate() >= trip.Departure().Date() );
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.StartDate() <= trip.Departure().Date() and trans.EndDate() >= trip.Departure().Date() );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
- traverse( trip, ProductInTrip, pit, pit.Quantity() <> 0 and not isnull( column ) and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- quantity := [Number]pit.Quantity();
- row := table.GetRow( pit.ProductID() );
- product := pit.Product_MP();
- productparents := product.GetAllParent();
-
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = dlfactory );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcost := selectobject( transcosts, Elements, trans, trans.Origin() = laneleg.OriginStockingPointID()
- and trans.Destination() = laneleg.DestinationStockingPointID()
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
- if( not isnull( enginecost ) and not isnull( transcost ) ){
- products.Add( product );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- //杩愯緭鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环
- cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- cell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + cost );
- }
- }
- }
- }
- }
- }
- //澶ц繛澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬澶ц繛宸ュ巶璇ヤ骇鍝佷骇閲忓噺鍘诲彂寰�闀挎槬(澶ц繛鐨勯暱鏄ュ绉熷簱锛夌殑鏁伴噺-newSupply
- traverse( owner, FinancialProductionSource, source, not source.IsImport() ){//璐㈠姟浜ч噺鎶ヨ〃闈炲鍏�
- traverse( source, FinancialProductionReport, report, not report.IsShow() ){//璐㈠姟浜ч噺鎶ヨ〃涓嶆樉绀�
- traverse( report, FinancialProductionRow, row, row.Unit() = dlunit and exists( row, FinancialProductionCell, cell, cell.Value() <> '0' and not cell.FinancialProductionColumn().IsDay() ) ){//璐㈠姟浜ч噺鎶ヨ〃閲岀殑澶ц繛浜ч噺, 涓嶄负0
- product := row.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = dlfactory );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( product );
- ccrow := table.GetRow( row.Name() );
- traverse( row, FinancialProductionCell, cell, cell.Value() <> '0' and not cell.FinancialProductionColumn().IsDay() ){
- cellcolumn := cell.FinancialProductionColumn();
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= cellcolumn.Period() and engine.EndDate() >= cellcolumn.Period() );
- if( not isnull( enginecost ) ){
- column := selectobject( table, Column, column, column.Name() = cell.FinancialProductionColumn().Name() );
- //澶ц繛澶栫搴撳叆搴撹垂鐢�
- ccrow.SetDLRentEnterCost( column, enginecost, cell );
- }
- }
- }
- }
- }
- }
- }
- //澶ц繛澶栫搴撳嚭搴撹垂鐢細鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环锛屽嚭搴撻噺绛変簬澶ц繛宸ュ巶璇ヤ骇鍝侀攢閲忓噺鍘诲彂寰�闀挎槬鐨勬暟閲�-newSupply, 澶ц繛鍘傚唴搴擄紝澶ц繛澶栫搴�
- traverse( owner, FinancialSalesSource, source, not source.IsImport() ){//璐㈠姟閿�閲忔姤琛ㄩ潪瀵煎叆
- traverse( source, FinancialSalesReport, report, not report.IsShow() ){//璐㈠姟閿�閲忔姤琛ㄤ笉鏄剧ず
- traverse( report, FinancialSalesRow, row, row.Unit() = ccunit and exists( row, FinancialSalesCell, cell, cell.Value() <> '0' and not cell.FinancialSalesColumn().IsDay() ) ){//璐㈠姟閿�閲忔姤琛ㄩ噷鐨勫ぇ杩炰骇閲�, 涓嶄负0
- product := row.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = dlfactory );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( product );
- ccrow := table.GetRow( row.Name() );
- traverse( row, FinancialSalesCell, cell, cell.Value() <> '0' and not cell.FinancialSalesColumn().IsDay() ){
- cellcolumn := cell.FinancialSalesColumn();
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= cellcolumn.Period() and engine.EndDate() >= cellcolumn.Period() );
- if( not isnull( enginecost ) ){
- column := selectobject( table, Column, column, column.Name() = cell.FinancialSalesColumn().Name() );
- //澶ц繛澶栫搴撳嚭搴撹垂鐢�
- ccrow.SetDLRentOutCost( column, enginecost, cell );
- }
- }
- }
- }
- }
- }
- }
+
//闀挎槬闀块�旇繍杈撹垂鐢細璋冩嫧鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环锛岃皟鎷ㄨ鍒掗噷鎵惧埌璇ヤ骇鍝佷粠DL鍒癈C鐨勮皟鎷ㄦ暟閲忥紝鍗宠捣濮嬪湴澶ц繛瑁呴厤绾胯竟搴擄紝鐩殑鍦颁负闀挎槬澶栫搴撳搴旂殑杩愯緭鏁伴噺锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃鎵惧埌瀵瑰簲鐨勫寘瑁呭閲忥紝鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲忥紝鐢ㄥ叕寮忚绠楀緱鍑虹粨鏋滐紝鏈堝害杩涜姹囨��
- traverse( owner, TransferPlanRow, tprow ){
- product := selectobject( owner, Product_MP, product, product.ID() = tprow.ProductID() );
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛(澶ц繛鍘傚唴搴擄級
- isdl := tprow.SourceStockpoingPointID().EndsWith( '鍘傚唴搴�' ) and ( tprow.TargetStockpoingPointID().StartsWith( '澶ц繛' ) or tprow.TargetStockpoingPointID().StartsWith( 'DL' ) );
- //鐩殑鍦板簱瀛樼偣鏄惁鏄暱鏄ワ紙闀挎槬澶栫搴擄級
- iscc := tprow.TargetStockpoingPointID().EndsWith( '澶栫搴�' ) and ( tprow.TargetStockpoingPointID().StartsWith( '闀挎槬' ) or tprow.TargetStockpoingPointID().StartsWith( 'CC' ) );
+ traverse( owner, Unit.Lane.LaneLeg, laneleg ){
+ //璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛(澶ц繛鍘傚唴搴擄級
+ isdl := laneleg.OriginStockingPointID().EndsWith( '鍘傚唴搴�' ) and ( laneleg.OriginStockingPointID().StartsWith( '澶ц繛' ) or laneleg.OriginStockingPointID().StartsWith( 'DL' ) );
+ //鐩殑鍦板簱瀛樼偣鏄惁鏄暱鏄ワ紙闀挎槬澶栫搴擄級
+ iscc := laneleg.DestinationStockingPointID() = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
if( isdl and iscc ){
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccfactory );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.Origin() = tprow.SourceStockpoingPointID()
- and trans.Destination() = tprow.TargetStockpoingPointID()
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+ traverse( table, Column, column){//, column.StartDate().Month() = 1
+ alltrips := selectset( laneleg, Trip, trip, trip.Arrival().Date() < column.StartDate().StartOfNextMonth() and trip.Arrival().Date() >= column.StartDate() );
+ enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate() );
+ transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() );
if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
- row := table.GetRow( product.ID() );
- products.Add( product );
- traverse( tprow,TransferPlanCell, tpcell, tpcell.TransferPlanColumn().ColumnDate() <> Date::MinDate() and [Number]tpcell.Value() > 0){
- tpcolumndate := tpcell.TransferPlanColumn().ColumnDate();
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= tpcolumndate and engine.EndDate() >= tpcolumndate );
- transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= tpcolumndate and trans.EndDate() >= tpcolumndate );
- if( not isnull( enginecost ) and not isnull( transcost ) ){
- periodtime := tpcolumndate.StartOfMonth();
- periodname := periodtime.Format( "M2/D2/Y" );
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
-
- cost := ceil( ceil( [Number]tpcell.Value() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.CCLongTransCost( cell.CCLongTransCost() + cost );
- }
+ producttrips := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ), pit.ProductID() );
+ traverse( producttrips, Elements, producttrip ){//, producttrip = '6912'
+
+ row := table.GetRow( producttrip );
+ product := selectobject( owner, Product_MP, product, product.ID() = producttrip );
+ products.Add( product );
+ quantity := sum( alltrips, Elements.ProductInTrip, pit, pit.Product_MP() = product, pit.Quantity() );
+ enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower()
+ and engine.MLB_MQB() = product.MQBMLB()
+ and engine.Factory() = ccfactory );
+ //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
+ transcost := selectobject( transcosts, Elements, trans, trans.Origin() = laneleg.OriginStockingPointID()
+ and trans.Destination() = laneleg.DestinationStockingPointID()
+ and exists( product.GetAllParent(), Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+
+ if( not isnull( enginecost ) and not isnull( transcost ) ){
+ cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
+ cell := selectobject( row, Cell, cell, cell.Column() = column );
+ cell.CCLongTransCost( cell.CCLongTransCost() + cost )
+ }
}
}
}
+ //traverse( owner, TransferPlanRow, tprow ){
+ // product := selectobject( owner, Product_MP, product, product.ID() = tprow.ProductID() );
+ // productparents := product.GetAllParent();
+ // if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
+ // //璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛(澶ц繛鍘傚唴搴擄級
+ // isdl := tprow.SourceStockpoingPointID().EndsWith( '鍘傚唴搴�' ) and ( tprow.TargetStockpoingPointID().StartsWith( '澶ц繛' ) or tprow.TargetStockpoingPointID().StartsWith( 'DL' ) );
+ // //鐩殑鍦板簱瀛樼偣鏄惁鏄暱鏄ワ紙闀挎槬澶栫搴擄級
+ // iscc := tprow.TargetStockpoingPointID().EndsWith( '澶栫搴�' ) and ( tprow.TargetStockpoingPointID().StartsWith( '闀挎槬' ) or tprow.TargetStockpoingPointID().StartsWith( 'CC' ) );
+ // if( isdl and iscc ){
+ // //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
+ // enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
+ // and engine.MLB_MQB() = product.MQBMLB()
+ // and engine.Factory() = ccfactory );
+ // //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
+ // transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.Origin() = tprow.SourceStockpoingPointID()
+ // and trans.Destination() = tprow.TargetStockpoingPointID()
+ // and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+ // if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
+ // row := table.GetRow( product.ID() );
+ // products.Add( product );
+ // traverse( tprow,TransferPlanCell, tpcell, tpcell.TransferPlanColumn().ColumnDate() <> Date::MinDate() and [Number]tpcell.Value() > 0){
+ // tpcolumndate := tpcell.TransferPlanColumn().ColumnDate();
+ // enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= tpcolumndate and engine.EndDate() >= tpcolumndate );
+ // transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= tpcolumndate and trans.EndDate() >= tpcolumndate );
+ // if( not isnull( enginecost ) and not isnull( transcost ) ){
+ // periodtime := tpcolumndate.StartOfMonth();
+ // periodname := periodtime.Format( "M2/D2/Y" );
+ // column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
+ //
+ // cost := ceil( ceil( [Number]tpcell.Value() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
+ // cell := selectobject( row, Cell, cell, cell.Column() = column );
+ // cell.CCLongTransCost( cell.CCLongTransCost() + cost );
+ // }
+ // }
+ // }
+ // }
}
}
//闀挎槬鐭�旇繍杈撹垂鐢細瀹㈡埛闇�姹傛暟閲�/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环锛屽鎴烽渶姹傛暟閲忓彇鑷猣orecast閲宻ales segment涓洪暱鏄ョ殑鏁伴噺姹囨�伙紝鍐嶇敤鍏紡璁＄畻锛屾湀搴﹁繘琛屾眹鎬伙紙鍙栧鎴烽渶姹傛暟閲忔崲绠楁垚杞︽锛�
- traverse( owner, SalesDemand.astype( Forecast ), forecast, forecast.Quantity() > 0 and not isnull( forecast.SalesSegment_MP() ) and forecast.StartDate() < startofnextyear ){
- salessegment := forecast.SalesSegment_MP();
- parentsalessegments := salessegment.GetAllParent();
- //鏄惁灞炰簬闀挎槬
- iscc := salessegment.Name().StartsWith( 'Changchun' ) or exists( parentsalessegments, Elements, psalessegment, psalessegment.Name().StartsWith( 'Changchun' ) );
- if( iscc ){
- product := forecast.Product_MP();
- productparents := product.GetAllParent();
- if( exists( productparents, Elements, e, e.ID() = produtparent ) ){//鏌ヨ浜у搧绫诲瀷鏄彂鍔ㄦ満
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
+ allforecast := selectset( owner, SalesDemand.astype( Forecast ), forecast, forecast.Quantity() > 0 and not isnull( forecast.SalesSegment_MP() ) and forecast.StartDate() < startofnextyear and //forecast.ProductID() = '6912' and forecast.StartDate().Month() = 1 and
+ // ( forecast.SalesSegment_MP().Name().StartsWith( 'Changchun' ) or exists( forecast.SalesSegment_MP().GetAllParent(), Elements, psalessegment, psalessegment.Name().StartsWith( 'Changchun' ) ) or
+ ( forecast.SalesSegment_MP().Name().StartsWith( 'Foshan' ) or forecast.SalesSegment_MP().Name().StartsWith( 'Tianjin' )
+ or exists( forecast.SalesSegment_MP().GetAllParent(), Elements, psalessegment, psalessegment.Name().StartsWith( 'Foshan' ) or psalessegment.Name().StartsWith( 'Tianjin' ) ) )
+ and exists( forecast.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ) );
+ //ccforecasts := selectset( allforecast, Elements, forecast, forecast.SalesSegment_MP().Name().StartsWith( 'Changchun' ) or exists( forecast.SalesSegment_MP().GetAllParent(), Elements, psalessegment, psalessegment.Name().StartsWith( 'Changchun' ) ) );
+ //ccproducts := selectuniquevalues( ccforecasts, Elements, forecast, forecast.ProductID() );
+ dlforecasts := selectset( allforecast, Elements, forecast, forecast.SalesSegment_MP().Name().StartsWith( 'Foshan' ) or forecast.SalesSegment_MP().Name().StartsWith( 'Tianjin' )
+ or exists( forecast.SalesSegment_MP().GetAllParent(), Elements, psalessegment, psalessegment.Name().StartsWith( 'Foshan' ) or psalessegment.Name().StartsWith( 'Tianjin' ) ) );
+ dlproducts := selectuniquevalues( dlforecasts, Elements, forecast, forecast.ProductID() );;
+ //traverse( ccproducts, Elements, ccproduct){
+ // product := selectobject( owner, Product_MP, product, product.ID() = ccproduct );
+ //// info( '************', product.ID(), exists( ccforecasts, Elements, forecast, forecast.Quantity() > 0 ));
+ // //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
+ // enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
+ // and engine.MLB_MQB() = product.MQBMLB()and engine.Factory() = ccfactory );
+ // //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
+ // transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.Origin() = '闀挎槬澶栫搴�'
+ // and trans.Destination() = '瀹㈡埛搴�'
+ // and exists( product.GetAllParent(), Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+ // if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
+ // row := table.GetRow( ccproduct )
+ // products.Add( product );
+ // traverse( table, Column, column ){
+ // allpsdips := selectset( ccforecasts, Elements.PlanningSalesDemandInPeriod, psdip, psdip.ProductID() = ccproduct and psdip.Quantity() > 0 and psdip.StartDate() < column.StartDate().StartOfNextMonth() and psdip.StartDate() >= column.StartDate() );
+ // enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate() );
+ // transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() );
+ // if( not isnull( enginecost ) and not isnull( transcost ) ){
+ // quantity := sum( allpsdips, Elements, psdip, psdip.Quantity() );
+ // cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
+ // cell := selectobject( row, Cell, cell, cell.Column() = column );
+ // cell.CCShorTransCost( cell.CCShorTransCost() + cost );
+ // }
+ // }
+ // }
+ //}
+ traverse( dlproducts, Elements, ccproduct){
+
+ row := table.GetRow( ccproduct )
+ product := selectobject( owner, Product_MP, product, product.ID() = ccproduct );
+ //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccfactory );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.Origin() = '闀挎槬澶栫搴�'
- and trans.Destination() = '瀹㈡埛搴�'
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
- products.Add( forecast.Product_MP() );
- row := table.GetRow( forecast.ProductID() );
- traverse( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() > 0 ){
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= psdip.StartDate() and engine.EndDate() >= psdip.StartDate() );
- transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= psdip.StartDate() and trans.EndDate() >= psdip.StartDate() );
- if( not isnull( enginecost ) ){
- periodtime := psdip.StartDate().StartOfMonth();
- periodname := periodtime.Format( "M2/D2/Y" );
- // info( '-------------------------', periodname, periodtime );
- column := selectobject( table, Column, column, column.Name() = periodname and column.StartDate() = periodtime );
- // info( '-------------------------', column.Name() );
- cost := ceil( ceil( [Number]psdip.Quantity() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.CCShorTransCost( cell.CCShorTransCost() + cost );
- }
- }
+ and engine.MLB_MQB() = product.MQBMLB()and engine.Factory() = dlfactory );
+ if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
+ traverse( table, Column, column ){
+ allpsdips := selectset( dlforecasts, Elements.PlanningSalesDemandInPeriod, psdip, psdip.ProductID() = ccproduct and psdip.Quantity() > 0 and psdip.StartDate() < column.StartDate().StartOfNextMonth() and psdip.StartDate() >= column.StartDate() );
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate() );
+ if( not isnull( enginecost ) ){
+ products.Add( product );
+ quantity := sum( allpsdips, Elements, psdip, psdip.Quantity() );
+
+ cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ row.SetDLRentOutCost( column, cost );
}
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl
index 4808e29..e426aa2 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow/Method_Initialize.qbl
@@ -2,16 +2,18 @@
#parent: #root
Method Initialize (
CCEngineLogisticsCostColumn column
-)
+) as CCEngineLogisticsCostCell
{
TextBody:
[*
// 鐢勫叞楦� Jun-24-2024 (created)
cell := this.Cell( relnew, RentInCost := 0
- , RentOutOfCost := 0
- , WerkToRentTransCost := 0
- , RentStorCost := 0 );
+ , RentOutOfCost := 0
+ , WerkToRentTransCost := 0
+ , RentStorCost := 0
+ , CoefficientValue := '1.05' );
column.Cell( relinsert, cell );
+ return cell;
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl
index 4ffa94e..793c104 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl
@@ -2,21 +2,23 @@
#parent: #root
Method Initialize (
DLEngineLogisticsCostColumn column
-)
+) as DLEngineLogisticsCostCell
{
TextBody:
[*
// 鐢勫叞楦� Jun-24-2024 (created)
cell := this.Cell( relnew, CCRentInCost := 0
- , CCRentOutOfCost := 0
- , CCLongTransCost := 0
- , CCShorTransCost := 0
- , CCRentStorCost := 0
- , DLRentInCost := 0
- , DLRentOutOfCost := 0
- , WerkToDLRentTransCost := 0
- , DLRentStorCost := 0 );
+ , CCRentOutOfCost := 0
+ , CCLongTransCost := 0
+ , CCShorTransCost := 0
+ , CCRentStorCost := 0
+ , DLRentInCost := 0
+ , DLRentOutOfCost := 0
+ , WerkToDLRentTransCost := 0
+ , DLRentStorCost := 0
+ , CoefficientValue := '1.05');
column.Cell( relinsert, cell );
+ return cell;
*]
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl
index 8445a49..5552f74 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentEnterCost.qbl
@@ -3,14 +3,13 @@
Method SetDLRentEnterCost (
DLEngineLogisticsCostColumn column,
LogisticsCostEngine enginecost,
- FinancialProductionCell fpcell
+ Real quantity
)
{
TextBody:
[*
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- quantity := fpcell.Quantity() - cell.CCRentQty();
//鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬闀挎槬浜ч噺
cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
othercost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OtherPrice();
diff --git a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl
index 2c253f0..185441f 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostRow0/Method_SetDLRentOutCost.qbl
@@ -2,19 +2,14 @@
#parent: #root
Method SetDLRentOutCost (
DLEngineLogisticsCostColumn column,
- LogisticsCostEngine enginecost,
- FinancialSalesCell fscell
+ Real quantity
)
{
TextBody:
[*
// 鐢勫叞楦� Jun-24-2024 (created)
cell := selectobject( this, Cell, cell, cell.Column() = column );
- quantity := [Number]fscell.Value() - cell.CCRentQty();
- //鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环锛屽叆搴撻噺绛変簬闀挎槬浜ч噺
- cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
-
- value := cell.DLRentOutOfCost() + cost;
+ value := cell.DLRentOutOfCost() + quantity;
cell.DLRentOutOfCost( value );
*]
}
diff --git a/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl b/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl
index 5d5baa7..4b5cc53 100644
--- a/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl
+++ b/_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl
@@ -17,31 +17,30 @@
//杩囨护鍚庣殑浜у搧id
productids := selectuniquevalues( products, Elements, product, true, product.ID() );
rows := selectsortedset( table, Row, row, row.RowNr() );
- //鏄剧ず鍒�
- productcolumn := selectobject( this, Column, column, column.Index() = 0 );
- attricolumn := selectobject( this, Column, column, column.Index() = 1 );
models := selectuniquevalues( table, Column.Cell.Demand, demand, demand.Model() );
cellnr := 5 + models.Size();
//鍚堣琛�
- sumrowproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '鎬讳骇閲�', rows.Size() * cellnr, true );
- sumrowdlproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '澶ц繛浜ч噺', sumrowproduction.RowNr() + 1, false );
- sumrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '闀挎槬浜ч噺', sumrowproduction.RowNr() + 2, false );
- sumrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '鎬婚渶姹�', sumrowproduction.RowNr() + 3, false );
+ sumname := 'SUM';
+ sumstr := sumname.Format( 'S(Len(10))' );
+ sumrowproduction := EnginePipelineRow::CraeteCellValueForRow( this, sumstr.Concat( '鎬讳骇閲�' ), sumname, '', rows.Size() * cellnr );
+ sumrowdlproduction := EnginePipelineRow::CraeteCellValueForRow( this, sumstr.Concat( '澶ц繛浜ч噺' ), sumname, '', sumrowproduction.RowNr() + 1 );
+ sumrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, sumstr.Concat( '闀挎槬浜ч噺' ), sumname, '', sumrowproduction.RowNr() + 2 );
+ sumrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, sumstr.Concat( '鎬婚渶姹�' ), sumname, '', sumrowproduction.RowNr() + 3 );
rowno := sumrowproduction.RowNr() + 4;
traverse( models, Elements, model ){
- EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', model.Concat( '闇�姹�' ), rowno, false );
+ EnginePipelineRow::CraeteCellValueForRow( this, sumstr.Concat( model.Concat( '闇�姹�' ) ), sumname, model, rowno );
rowno := rowno + 1;
}
- sumrowinventory := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '搴撳瓨', rowno, false );
+ sumrowinventory := EnginePipelineRow::CraeteCellValueForRow( this, sumstr.Concat( '搴撳瓨' ), sumname, '', rowno );
//琛岃鏁�
rownr := 0;
traverse( rows, Elements, row, productids.Find( row.Name() ) >= 0 ){
-
- showrowproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '鎬荤敓浜�', rownr, true );;
- showrowdlproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '澶ц繛浜ч噺', rownr + 1, false );
- showrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '闀挎槬浜ч噺', rownr + 2, false );
- showrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '鎬婚渶姹�', rownr + 3, false );
+ rowname := row.Name().Format( 'S(Len(10))' );
+ showrowproduction := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '鎬讳骇閲�' ), row.Name(), '', rownr );
+ showrowdlproduction := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '澶ц繛浜ч噺' ), row.Name(), '', rownr + 1 );
+ showrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '闀挎槬浜ч噺' ), row.Name(), '', rownr + 2 );
+ showrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '鎬婚渶姹�' ), row.Name(), '', rownr + 3 );
rownr := rownr + 4;
modelsnr := rownr + 3;
models := construct( Strings );
@@ -50,7 +49,7 @@
traverse( uniquemodels, Elements, e ){
if( rownr < modelsnr ){
- EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), e.Concat( '闇�姹�' ), rownr, false );
+ EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( e.Concat( '闇�姹�' ) ), row.Name(), e, rownr );
models.Add( e );
rownr := rownr + 1;
}
@@ -58,9 +57,9 @@
for( rownr := rownr; rownr < modelsnr; rownr ++ ){
- EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '', rownr, false );
+ EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '' ), row.Name(), '', rownr );
}
- showrowinventory := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '搴撳瓨', rownr, false );
+ showrowinventory := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '搴撳瓨' ), row.Name(), '', rownr );
traverse( row, Cell, cell, cell.Column().TimeUnit() = search.TimeUnit() ){
@@ -114,8 +113,8 @@
sumdemand.Value( [String]( [Real]sumdemand.Value() + cell.DemandQuantity() ) );
traverse( cell, Demand, demand, exists( models, Elements, model, model = demand.Model() ) ){
- demandrow := selectobject( this, Row, r, r.Name() = row.Name() and exists( r, CellValue, cv, cv.Column() = attricolumn and cv.Value() = demand.Model().Concat( '闇�姹�' ) ) );
- sumdemandrow := selectobject( this, Row, r, r.Name() = 'SUM' and exists( r, CellValue, cv, cv.Column() = attricolumn and cv.Value() = demand.Model().Concat( '闇�姹�' ) ) );
+ demandrow := selectobject( this, Row, r, r.Product() = row.Name() and r.Demand() = demand.Model() );
+ sumdemandrow := selectobject( this, Row, r, r.Name() = sumname and r.Demand() = demand.Model() );
if( not isnull( demandrow ) ){
demandcell := column.CellValue( relnew, Value := [String]demand.Quantity() );
@@ -155,7 +154,7 @@
}
traverse( this, Column, column ){
for( demandr := sumrowdemand.RowNr() + 1; demandr < sumrowinventory.RowNr(); demandr := demandr + 1 ){
- demandrow := selectobject( this, Row, r, r.RowNr() = demandr and r.Name() = 'SUM' );
+ demandrow := selectobject( this, Row, r, r.RowNr() = demandr and r.Name() = sumname );
// info( '------------------14----------------' );
if( not isnull( demandrow ) and not exists( demandrow, CellValue, cv, cv.Column() = column ) ){
demandcell := column.CellValue( relnew, Value := '' );
diff --git a/_Main/BL/Type_EnginePipelineReport/Method_GenerateNew.qbl b/_Main/BL/Type_EnginePipelineReport/Method_GenerateNew.qbl
deleted file mode 100644
index 43b285e..0000000
--- a/_Main/BL/Type_EnginePipelineReport/Method_GenerateNew.qbl
+++ /dev/null
@@ -1,180 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Method GenerateNew (
- EnginePipelineSearch search,
- Product_MPs products
-)
-{
- TextBody:
- [*
- // 鐢勫叞楦� Jun-25-2024 (created)
- table := selectobject( this, Source.Report, report, not report.IsShow() );
- //娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
- this.Clear( search.TimeUnit(), search.StartDate(), search.EndDate() );
- Transaction::Transaction().Propagate( attribute( EnginePipelineColumn, Index ) );
- Transaction::Transaction().Propagate( attribute( EnginePipelineCell, ProductionQuantity ) );
- Transaction::Transaction().Propagate( attribute( EnginePipelineCell, DemandQuantity ) );
- //杩囨护鍚庣殑浜у搧id
- productids := selectuniquevalues( products, Elements, product, true, product.ID() );
- rows := selectsortedset( table, Row, row, row.RowNr() );
- //鏄剧ず鍒�
- productcolumn := selectobject( this, Column, column, column.Index() = 0 );
- attricolumn := selectobject( this, Column, column, column.Index() = 1 );
- models := selectuniquevalues( table, Column.Cell.Demand, demand, demand.Model() );
- cellnr := 5 + models.Size();
- //鍚堣琛�
- sumrowproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '鎬讳骇閲�', rows.Size() * cellnr, true );
- sumrowdlproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '澶ц繛浜ч噺', sumrowproduction.RowNr() + 1, false );
- sumrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '闀挎槬浜ч噺', sumrowproduction.RowNr() + 2, false );
- sumrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '鎬婚渶姹�', sumrowproduction.RowNr() + 3, false );
- rowno := sumrowproduction.RowNr() + 4;
- traverse( models, Elements, model ){
- EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', model.Concat( '闇�姹�' ), rowno, false );
- rowno := rowno + 1;
- }
- sumrowinventory := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, 'SUM', '搴撳瓨', rowno, false );
-
- //琛岃鏁�
- rownr := 0;
- traverse( rows, Elements, row, productids.Find( row.Name() ) >= 0 ){
-
- //浜у搧鏄剧ず琛�
- showrowproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '鎬荤敓浜�', rownr, true );;
- showrowdlproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '澶ц繛浜ч噺', rownr + 1, false );
- showrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '闀挎槬浜ч噺', rownr + 2, false );
- showrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '鎬婚渶姹�', rownr + 3, false );
- rownr := rownr + 4;
- modelsnr := rownr + 3;
- models := construct( Strings );
- uniquemodels := selectuniquevalues( row, Cell.Demand, demand, true, demand.Model() );
- //闇�姹傛樉绀�
- traverse( uniquemodels, Elements, e ){
-
- if( rownr < modelsnr ){
- EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), e.Concat( '闇�姹�' ), rownr, false );
- models.Add( e );
- rownr := rownr + 1;
- }
- }
- //绌洪渶姹傝ˉ鍏�
- for( rownr := rownr; rownr < modelsnr; rownr ++ ){
-
- EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '', rownr, false );
- }
- showrowinventory := EnginePipelineRow::CraeteCellValueForRow( this, productcolumn, attricolumn, row.Name(), '搴撳瓨', rownr, false );
-
- // traverse( this, Column, column ){
- // //鏌ヨ鏃堕棿绫诲瀷涓篸ay鐨勫崟鍏冩牸
- // daycells := selectset( row, Cell, daycell, daycell.Column().TimeUnit() = Translations::MP_GlobalParameters_Day() and
- // cell.Column().StartDate() >= column.StartDate() and
- // cell.Column().StartDate() <= column.EndaDate() );
- traverse( row, Cell, cell, cell.Column().TimeUnit() = search.TimeUnit() ){
-
- column := selectobject( this, Column, column, column.Name() = cell.Column().Name() and column.TimeUnit() = search.TimeUnit() );
-
- if( not isnull( column ) ){
-
- //鐢熶骇
- production := column.CellValue( relnew, Value := [String]cell.ProductionQuantity() );
- showrowproduction.CellValue( relinsert, production );
- sumproduction := selectobject( column, CellValue, c, c.Row() = sumrowproduction );
-
- if( isnull( sumproduction ) ){
- sumproduction := column.CellValue( relnew, Value := [String]0 );
- sumrowproduction.CellValue( relinsert, sumproduction );
- }
- sumproduction.Value( [String]( [Real]sumproduction.Value() + cell.ProductionQuantity() ) );
-
- //澶ц繛浜ч噺
- dlproductionquantity := guard( cell.Production().DLProduction(), 0 );
- dlproduction := column.CellValue( relnew, Value := [String]dlproductionquantity );
- showrowdlproduction.CellValue( relinsert, dlproduction );
- sumdlproduction := selectobject( column, CellValue, c, c.Row() = sumrowdlproduction );
-
- if( isnull( sumdlproduction ) ){
- sumdlproduction := column.CellValue( relnew, Value := [String]0 );
- sumrowdlproduction.CellValue( relinsert, sumdlproduction );
- }
- sumdlproduction.Value( [String]( [Real]sumdlproduction.Value() + dlproductionquantity ) );
-
- //闀挎槬浜ч噺
- ccproductionquantity := guard( cell.Production().CCProduction(), 0 );
- ccproduction := column.CellValue( relnew, Value := [String]ccproductionquantity );
- showrowccproduction.CellValue( relinsert, ccproduction );
- sumccproduction := selectobject( column, CellValue, c, c.Row() = sumrowccproduction );
-
- if( isnull( sumccproduction ) ){
- sumccproduction := column.CellValue( relnew, Value := [String]0 );
- sumrowccproduction.CellValue( relinsert, sumccproduction );
- }
- sumccproduction.Value( [String]( [Real]sumccproduction.Value() + ccproductionquantity ) );
-
- //闇�姹�
- totaldemand := column.CellValue( relnew, Value := [String]cell.DemandQuantity() );
- showrowdemand.CellValue( relinsert, totaldemand );
- sumdemand := selectobject( column, CellValue, c, c.Row() = sumrowdemand );
- if( isnull( sumdemand ) ){
- sumdemand := column.CellValue( relnew, Value := [String]0 );
- sumrowdemand.CellValue( relinsert, sumdemand );
- }
- sumdemand.Value( [String]( [Real]sumdemand.Value() + cell.DemandQuantity() ) );
-
- traverse( cell, Demand, demand, exists( models, Elements, model, model = demand.Model() ) ){
- demandrow := selectobject( this, Row, r, r.Name() = row.Name() and exists( r, CellValue, cv, cv.Column() = attricolumn and cv.Value() = demand.Model().Concat( '闇�姹�' ) ) );
- sumdemandrow := selectobject( this, Row, r, r.Name() = 'SUM' and exists( r, CellValue, cv, cv.Column() = attricolumn and cv.Value() = demand.Model().Concat( '闇�姹�' ) ) );
-
- if( not isnull( demandrow ) ){
- demandcell := column.CellValue( relnew, Value := [String]demand.Quantity() );
- demandrow.CellValue( relinsert, demandcell );
- }
- if( not isnull( sumdemandrow ) ){
- sumdemandcell := selectobject( column, CellValue, c, c.Row() = sumdemandrow );
- if( isnull( sumdemandcell ) ){
- sumdemandcell := column.CellValue( relnew, Value := [String]0 );
- sumdemandrow.CellValue( relinsert, sumdemandcell );
- }
- sumdemandcell.Value( [String]( [Real]sumdemandcell.Value() + demand.Quantity() ) );
- }
- }
-
- for( demandr := showrowdemand.RowNr() + 1; demandr < showrowinventory.RowNr(); demandr := demandr + 1 ){
- demandrow := selectobject( this, Row, r, r.RowNr() = demandr and r.Name() = row.Name() );
- if( not isnull( demandrow ) and not exists( demandrow, CellValue, cv, cv.Column() = column ) ){
- demandcell := column.CellValue( relnew, Value := '' );
- demandrow.CellValue( relinsert, demandcell );
- }
- }
-
-
- //搴撳瓨
- inventory := column.CellValue( relnew, Value := [String]cell.InventoryQuantity() );
- showrowinventory.CellValue( relinsert, inventory );
- suminventory := selectobject( column, CellValue, c, c.Row() = sumrowinventory );
- if( isnull( suminventory ) ){
- suminventory := column.CellValue( relnew, Value := [String]0 );
- sumrowinventory.CellValue( relinsert, suminventory );
- }
- suminventory.Value( [String]( [Real]suminventory.Value() + cell.InventoryQuantity() ) );
-
- }
- }
- }
- traverse( this, Column, column ){
- for( demandr := sumrowdemand.RowNr() + 1; demandr < sumrowinventory.RowNr(); demandr := demandr + 1 ){
- demandrow := selectobject( this, Row, r, r.RowNr() = demandr and r.Name() = 'SUM' );
- // info( '------------------14----------------' );
- if( not isnull( demandrow ) and not exists( demandrow, CellValue, cv, cv.Column() = column ) ){
- demandcell := column.CellValue( relnew, Value := '' );
- demandrow.CellValue( relinsert, demandcell );
- }
- }
- }
-
- rows := selectsortedset( this, Row, row, row.Name(), row.RowNr() );
- i := 0;
- traverse( rows, Elements, e ){
- e.RowNr( i );
- i := i + 1;
- }
- *]
-}
diff --git a/_Main/BL/Type_EnginePipelineRow/Attribute_Demand.qbl b/_Main/BL/Type_EnginePipelineRow/Attribute_Demand.qbl
new file mode 100644
index 0000000..3a36756
--- /dev/null
+++ b/_Main/BL/Type_EnginePipelineRow/Attribute_Demand.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Demand
+{
+ #keys: '3[415136.0.1188490188][415136.0.1188490187][415136.0.1188490189]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_EnginePipelineRow/Attribute_Product.qbl b/_Main/BL/Type_EnginePipelineRow/Attribute_Product.qbl
new file mode 100644
index 0000000..c6beed0
--- /dev/null
+++ b/_Main/BL/Type_EnginePipelineRow/Attribute_Product.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.1188500276][415136.0.1188500275][415136.0.1188500277]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_EnginePipelineRow/DefaultValue_Product.qbl b/_Main/BL/Type_EnginePipelineRow/DefaultValue_Product.qbl
new file mode 100644
index 0000000..6e10c8e
--- /dev/null
+++ b/_Main/BL/Type_EnginePipelineRow/DefaultValue_Product.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Product
+}
diff --git a/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl b/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl
index 98c8ffe..2d828d6 100644
--- a/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl
+++ b/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl
@@ -2,26 +2,17 @@
#parent: #root
StaticMethod CraeteCellValueForRow (
EnginePipelineReport table,
- EnginePipelineColumn productcolumn,
- EnginePipelineColumn attricolumn,
- String productname,
- String attriname,
- Number rownr,
- Boolean isfirst
+ String name,
+ String product,
+ String demand,
+ Number rownr
) as EnginePipelineRow
{
TextBody:
[*
// 鐢勫叞楦� Jul-11-2024 (created)
- row := table.Row( relnew, Name := productname, RowNr := rownr );
- if( not isfirst ){
- productname := '';
- }
- pcell := productcolumn.CellValue( relnew, Value := productname );
- acell := attricolumn.CellValue( relnew, Value := attriname );
- row.CellValue( relinsert, pcell );
- row.CellValue( relinsert, acell );
- traverse( table, Column, column, column.Index() > 1 ){
+ row := table.Row( relnew, Name := name, RowNr := rownr, Product := product, Demand := demand );
+ traverse( table, Column, column ){
cell := column.CellValue( relnew, Value := '0' );
row.CellValue( relinsert, cell );
}
diff --git a/_Main/BL/Type_Factory/Attribute_ID.qbl b/_Main/BL/Type_Factory/Attribute_ID.qbl
new file mode 100644
index 0000000..2019742
--- /dev/null
+++ b/_Main/BL/Type_Factory/Attribute_ID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ID
+{
+ #keys: '3[415136.0.1188465615][415136.0.1188465614][415136.0.1188465616]'
+ IsReadOnly: true
+ ValueType: String
+}
diff --git a/_Main/BL/Type_Factory/Attribute_Name.qbl b/_Main/BL/Type_Factory/Attribute_Name.qbl
new file mode 100644
index 0000000..d0bda88
--- /dev/null
+++ b/_Main/BL/Type_Factory/Attribute_Name.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Name
+{
+ #keys: '3[415136.0.1188465625][415136.0.1188465624][415136.0.1188465626]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_Factory/StaticMethod_Initilize.qbl b/_Main/BL/Type_Factory/StaticMethod_Initilize.qbl
new file mode 100644
index 0000000..24df125
--- /dev/null
+++ b/_Main/BL/Type_Factory/StaticMethod_Initilize.qbl
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Initilize (
+ MacroPlan owner
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Oct-12-2024 (created)
+ owner.Factory( relflush );
+ owner.Factory( relnew, ID := "<All>", Name := 'All' );
+ owner.Factory( relnew, ID := InventorySummaryReport::GetDefaultCCUnit(), Name := InventorySummaryReport::GetDefaultCCUnit() );
+ owner.Factory( relnew, ID := InventorySummaryReport::GetDefaultDLUnit(), Name := InventorySummaryReport::GetDefaultDLUnit() );
+ *]
+}
diff --git a/_Main/BL/Type_Factory/_ROOT_Type_Factory.qbl b/_Main/BL/Type_Factory/_ROOT_Type_Factory.qbl
new file mode 100644
index 0000000..6da8123
--- /dev/null
+++ b/_Main/BL/Type_Factory/_ROOT_Type_Factory.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type Factory
+{
+ #keys: '5[415136.0.1188465611][415136.0.1188465609][0.0.0][415136.0.1188465610][415136.0.1188465612]'
+ BaseType: Object
+ Description: '鏌ヨ宸ュ巶'
+ StructuredName: 'Factorys'
+}
diff --git a/_Main/BL/Type_FinancialProductionCell/Attribute_IsUpdate.qbl b/_Main/BL/Type_FinancialProductionCell/Attribute_IsUpdate.qbl
new file mode 100644
index 0000000..9990784
--- /dev/null
+++ b/_Main/BL/Type_FinancialProductionCell/Attribute_IsUpdate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsUpdate
+{
+ #keys: '3[415136.0.1188550030][415136.0.1188550029][415136.0.1188550031]'
+ Description: '鏄惁琚洿鏂�'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_FinancialProductionSource/Method_AfterImport.qbl b/_Main/BL/Type_FinancialProductionSource/Method_AfterImport.qbl
index bb784f2..deb4c18 100644
--- a/_Main/BL/Type_FinancialProductionSource/Method_AfterImport.qbl
+++ b/_Main/BL/Type_FinancialProductionSource/Method_AfterImport.qbl
@@ -6,35 +6,58 @@
[*
// 鐢勫叞楦� Jun-24-2024 (created)
allunit := FinancialProductionReport::GetDefaultAllUnit();
- table := selectobject( this.MacroPlan(), FinancialProductionSource.FinancialProductionReport, table, not table.IsImport() and not table.IsShow() );
- //info( '--------------------------', table.Name() );
+ //鏌ヨ闇�瑕佸鍏ョ殑鎶ヨ〃
+ table := selectobject( this.MacroPlan(), FinancialProductionSource.FinancialProductionReport, table, not table.IsImport() and not table.IsShow() );
+ cnv2 := StringToDate::StandardConverter();
+ cnv2.SetCustomConversion();
+ cnv2.CustomFormatString( "M2/D2/Y" );
traverse( this, FinancialProductionReport, report ){
- productcolumn := selectobject( report, FinancialProductionColumn, column, column.Name() = 'Product' );
- unitcolumn := selectobject( report, FinancialProductionColumn, column, column.Name() = 'Unit' );
- // info( '----------------------1-----------------', productcolumn.Name(), unitcolumn.Name() );
-
+ //鑾峰彇瀵煎叆鐨勪骇鍝佸垪鍜屽伐鍘傚垪
+ productcolumn := selectobject( report, FinancialProductionColumn, column, column.Name() = 'Product' );
+ unitcolumn := selectobject( report, FinancialProductionColumn, column, column.Name() = 'Unit' );
+ //璇诲彇姣忎竴琛�
traverse( report, FinancialProductionRow, row ){
- product := selectobject( row, FinancialProductionCell, cell, cell.FinancialProductionColumn() = productcolumn );
- unit := selectobject( row, FinancialProductionCell, cell, cell.FinancialProductionColumn() = unitcolumn );
- // info( '----------------------2-----------------', product.Value(), unit.Value() );
+ //鑾峰彇浜у搧鍜屽伐鍘�
+ product := selectobject( row, FinancialProductionCell, cell, cell.FinancialProductionColumn() = productcolumn );
+ unit := selectobject( row, FinancialProductionCell, cell, cell.FinancialProductionColumn() = unitcolumn );
+ //鑾峰彇琚鍏ユ姤琛ㄧ殑宸ュ巶琛�
unitrow := selectobject( table, FinancialProductionRow, unitrow, unitrow.Name() = product.Value() and unitrow.Unit() = unit.Value() );
+ if( isnull( unitrow ) ){
+ unitrow := table.FinancialProductionRow( relnew, Name := product.Value(), Unit := unit.Value() );
+ }
allrow := selectobject( table, FinancialProductionRow, allrow, allrow.Name() = product.Value() and allrow.Unit() = allunit );
- // info( '----------------------3-----------------', unitrow.Name(), unitrow.Unit() );
- // and product.Value() = '120 kW Rotor' and unit.Value() = 'Assembly Plant (Spain)'
+ if( isnull( unitrow ) ){
+ allrow := table.FinancialProductionRow( relnew, Name := product.Value(), Unit := allunit );
+ }
+
+ //璇诲彇姣忎竴琛岀殑鍗曞厓鏍�
traverse( row, FinancialProductionCell, cell, cell.FinancialProductionColumn() <> productcolumn and cell.FinancialProductionColumn() <> unitcolumn ){
- column := cell.FinancialProductionColumn();
- unitcell := selectobject( unitrow, FinancialProductionCell, unitcell, unitcell.FinancialProductionColumn().Name() = column.Name() );
- allcell := selectobject( allrow, FinancialProductionCell, allcell, allcell.FinancialProductionColumn().Name() = column.Name() );
- // info( isnull( unitcell ), isnull( allcell ), cell.Value(), unitcell.Value(), allcell.Value() );
- if( not isnull( unitcell ) ){
- // unitcell.Value( cell.Value() );
- unitcell.Quantity( [Real]cell.Value() );
+ //鑾峰彇琚鍏ユ姤琛ㄧ殑鏃ユ湡鍒�
+ tablecolumn := selectobject( table, FinancialProductionColumn, column, not column.IsDay() and column.Name() = cell.FinancialProductionColumn().Name() );
+ if( isnull( tablecolumn ) ){
+ tablecolumn := table.FinancialProductionColumn( relnew, Name := cell.FinancialProductionColumn().Name(), Period := cnv2.Convert( cell.FinancialProductionColumn().Name() ) );
}
- if( not isnull( allcell ) ){
- // value := [Real]cell.Value() + [Real]allcell.Value();
- // allcell.Value( [String]value );
- allcell.Quantity( allcell.Quantity() + [Real]allcell.Value() );
+ //鑾峰彇琚鍏ユ姤琛ㄧ殑鍗曞厓鏍�
+ unitcell := selectobject( unitrow, FinancialProductionCell, unitcell, unitcell.FinancialProductionColumn() = tablecolumn );
+ if( isnull( unitcell ) ){
+ unitcell := tablecolumn.FinancialProductionCell( relnew, IsUpdate := true, Quantity := [Real]cell.Value(), Value := cell.Value() );
+ unitrow.FinancialProductionCell( relinsert, unitcell );
+ }else{
+ if( unitcell.Quantity() <> [Real]cell.Value() ){
+ unitcell.Quantity( [Real]cell.Value() );
+ unitcell.IsUpdate( true );
+ }
+ }
+ allcell := selectobject( allrow, FinancialProductionCell, allcell, allcell.FinancialProductionColumn() = tablecolumn );
+ if( isnull( unitcell ) ){
+ allcell := tablecolumn.FinancialProductionCell( relnew, Quantity := [Real]cell.Value(), Value := cell.Value() );
+ allrow.FinancialProductionCell( relinsert, allcell );
+ }else{
+ if( allcell.Quantity() <> [Real]cell.Value() ){
+ allcell.Quantity( [Real]cell.Value() );
+ allcell.IsUpdate( true );
+ }
}
}
}
diff --git a/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl
index 541eafb..f349134 100644
--- a/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl
@@ -11,10 +11,6 @@
owner.FPImportData( relflush );
ccunit := FinancialProductionReport::GetDefaultCCUnit();
dlunit := FinancialProductionReport::GetDefaultDLUnit();
- //ccalineunit := FinancialProductionReport::GetDefaultCCALineUnit();
- //dlalienunit := FinancialProductionReport::GetDefaultDLALineUnit()
- //ccmplineunit := FinancialProductionReport::GetDefaultCCMPLineUnit()
- //dlmplineunit := FinancialProductionReport::GetDefaultDLMPLineUnit();
allunit := FinancialProductionReport::GetDefaultAllUnit();
source := owner.FinancialProductionSource( relnew, IsImport := false, Name := FinancialProductionReport::GetDefaultName() );
table := source.FinancialProductionReport( relnew, ID := source.Name(), Name := source.Name(), IsImport := false );
@@ -26,25 +22,12 @@
search := owner.FinancialProductionSearch( relnew, Unit := allunit, Generation := allunit, MqbMlb := allunit, Power := allunit );
products := construct( Product_MPs );
- //闇�瑕佺殑鏃ユ湡鍖洪棿锛� 鍛ㄥ拰澶╃殑鍙渶瑕佸綋鍓嶆湀
- //periods := selectset( owner, Period_MP, period, not period.IsHistorical()
- // and period.StartDate() < startofnextmonth
- // and period.TimeUnit() <> Translations::MP_GlobalParameters_Quarter()
- // );
- //鑾峰彇褰撳墠鏈堥渶瑕佺殑Period
- //currentperiods := table.GetCurrentPeriod( startofplanning, periods );
table.GenerateColumn( owner );
//鍙栧綋鍓嶇増鏈殑product planning閲宯ew supply瀛楁锛屽垎澶ц繛鍜岄暱鏄ュ伐鍘傜殑浜х嚎锛岃繘琛屽姞鎬�
- //traverse( owner, StockingPoint_MP, stockingpoint ){
traverse( owner, StockingPoint_MP, stockingpoint, stockingpoint.ID().EndsWith( '鍘傚唴搴�' ) or stockingpoint.ID() = '澶ц繛澶栫搴�' ){
iscc := stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '闀挎槬' );
isdl := stockingpoint.ID().StartsWith( 'DL' ) or stockingpoint.ID().StartsWith( '澶ц繛' );
- // unit := stockingpoint.Unit();
- // parentunits := unit.GetAllParent();
- //鏄惁灞炰簬闀挎槬宸ュ巶
- // iscc := unit.ID() = ccalineunit or unit.ID() = ccmplineunit or exists( parentunits, Elements, punit, punit.ID() = ccalineunit or punit.ID() = ccmplineunit );
- //鏄惁灞炰簬澶ц繛宸ュ巶
- // isdl := unit.ID() = dlalienunit or unit.ID() = dlmplineunit or exists( parentunits, Elements, punit, punit.ID() = dlalienunit or punit.ID() = dlmplineunit );
+
if( iscc or isdl ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf()
and exists( pisp, ProductInStockingPointInPeriod, pispip, pispip.Period_MP().StartDate() >= startofyear and pispip.Period_MP().StartDate() < startofnextyear and pispip.NewSupplyQuantity() <> 0 ) ){
diff --git a/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_Initialize.qbl b/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_Initialize.qbl
index ba8dd8d..944d4bc 100644
--- a/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_Initialize.qbl
@@ -118,11 +118,11 @@
cumulantcolumn := table.FinancialWeeklyColumn( relnew, Name := '绱閲�' );
proportioncolumn := table.FinancialWeeklyColumn( relnew, Name := '鍗犳瘮' );
//SUM
- totalpcellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]totalpvaluesum );
+ totalpcellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]( [Number]totalpvaluesum ) );
totalproduction.FinancialWeeklyCell( relinsert, totalpcellsum );
- dlpcellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]dlpvaluesum );
+ dlpcellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]( [Number]dlpvaluesum ) );
dlproduction.FinancialWeeklyCell( relinsert, dlpcellsum );
- ccpcellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]ccpvaluesum );
+ ccpcellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]( [Number]ccpvaluesum ) );
ccproduction.FinancialWeeklyCell( relinsert, ccpcellsum );
totalscellsum := sumcolumn.FinancialWeeklyCell( relnew, Value := [String]totalsvaluesum );
totalsales.FinancialWeeklyCell( relinsert, totalscellsum );
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Order.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Order.qbl
new file mode 100644
index 0000000..8cd58fa
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Order.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Order
+{
+ #keys: '3[413988.0.1635820128][413988.0.1635820127][413988.0.1635820129]'
+ Description: '鐢熶骇椤哄簭锛圫tring锛�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_OrderNr.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_OrderNr.qbl
new file mode 100644
index 0000000..44a5a8d
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_OrderNr.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderNr
+{
+ #keys: '3[413988.0.1635820138][413988.0.1635820137][413988.0.1635820139]'
+ Description: '鐢熶骇椤哄簭锛圢umber锛�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductID.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductID.qbl
new file mode 100644
index 0000000..4dc7cd0
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductID
+{
+ #keys: '3[413988.0.1635820181][413988.0.1635820180][413988.0.1635820182]'
+ Description: '浜у搧ID'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductionLine.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductionLine.qbl
new file mode 100644
index 0000000..f3c8f62
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ProductionLine.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductionLine
+{
+ #keys: '3[413988.0.1635820098][413988.0.1635820097][413988.0.1635820099]'
+ Description: '浜х嚎鍚�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Quantity.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Quantity.qbl
new file mode 100644
index 0000000..16922d0
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_Quantity.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Quantity
+{
+ #keys: '3[413988.0.1635820108][413988.0.1635820107][413988.0.1635820109]'
+ Description: '鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternEnd.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternEnd.qbl
new file mode 100644
index 0000000..65372d1
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternEnd.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ShiftPatternEnd
+{
+ #keys: '3[413988.0.1635820171][413988.0.1635820170][413988.0.1635820172]'
+ Description: '鐝缁撴潫鏃堕棿'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternName.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternName.qbl
new file mode 100644
index 0000000..1c38c87
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ShiftPatternName
+{
+ #keys: '3[413988.0.1635820151][413988.0.1635820150][413988.0.1635820152]'
+ Description: '鐝鍚�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternStart.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternStart.qbl
new file mode 100644
index 0000000..ec09520
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_ShiftPatternStart.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ShiftPatternStart
+{
+ #keys: '3[413988.0.1635820161][413988.0.1635820160][413988.0.1635820162]'
+ Description: '鐝寮�濮嬫椂闂�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_StartDate.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_StartDate.qbl
new file mode 100644
index 0000000..a84aeba
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/Attribute_StartDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[413988.0.1635820118][413988.0.1635820117][413988.0.1635820119]'
+ Description: '寮�濮嬫椂闂�'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/_ROOT_Type_InterfaceNewOfflinePlanDetailData.qbl b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/_ROOT_Type_InterfaceNewOfflinePlanDetailData.qbl
new file mode 100644
index 0000000..eaa4ee7
--- /dev/null
+++ b/_Main/BL/Type_InterfaceNewOfflinePlanDetailData/_ROOT_Type_InterfaceNewOfflinePlanDetailData.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type InterfaceNewOfflinePlanDetailData
+{
+ #keys: '5[413988.0.1635820064][413988.0.1635820062][0.0.0][413988.0.1635820063][413988.0.1635820065]'
+ BaseType: Object
+ Description: '涓嬬嚎璁″垝姣忎釜鐗堟湰璇︾粏鏁版嵁'
+ StructuredName: 'InterfaceNewOfflinePlanDetailDatas'
+}
diff --git a/_Main/BL/Type_InterfaceOfflinePlanVersion/Attribute_ScenarioName.qbl b/_Main/BL/Type_InterfaceOfflinePlanVersion/Attribute_ScenarioName.qbl
new file mode 100644
index 0000000..2697709
--- /dev/null
+++ b/_Main/BL/Type_InterfaceOfflinePlanVersion/Attribute_ScenarioName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ScenarioName
+{
+ #keys: '3[413988.0.1635820050][413988.0.1635820049][413988.0.1635820051]'
+ Description: '鐗堟湰鍚�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_InterfaceOfflinePlanVersion/_ROOT_Type_InterfaceNewOfflinePlanVersion.qbl b/_Main/BL/Type_InterfaceOfflinePlanVersion/_ROOT_Type_InterfaceNewOfflinePlanVersion.qbl
new file mode 100644
index 0000000..75894ce
--- /dev/null
+++ b/_Main/BL/Type_InterfaceOfflinePlanVersion/_ROOT_Type_InterfaceNewOfflinePlanVersion.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type InterfaceNewOfflinePlanVersion
+{
+ #keys: '5[413988.0.1635820030][413988.0.1635820028][0.0.0][413988.0.1635820029][413988.0.1635820031]'
+ BaseType: Object
+ Description: '涓嬬嚎璁″垝鐗堟湰瀛樻。鏁版嵁'
+ StructuredName: 'InterfaceNewOfflinePlanVersions'
+}
diff --git a/_Main/BL/Type_InventorySummaryReport/Method_Generate.qbl b/_Main/BL/Type_InventorySummaryReport/Method_Generate.qbl
index 38e179b..52e5780 100644
--- a/_Main/BL/Type_InventorySummaryReport/Method_Generate.qbl
+++ b/_Main/BL/Type_InventorySummaryReport/Method_Generate.qbl
@@ -2,7 +2,8 @@
#parent: #root
Method Generate (
InventorySummarySearch search,
- Product_MPs products
+ Factorys factorys,
+ Strings productids
)
{
TextBody:
@@ -14,41 +15,17 @@
//鏌ヨ鏃ユ湡杩斿洖闇�瑕佸湪璁″垝鏃ユ湡涔嬪唴
if( search.StartDate().DateTime() < startofendyear and search.EndDate().DateTime() > startofyear ){
table := selectobject( this, InventorySummarySource.InventorySummaryReport, report, not report.IsShow() );
- allunit := '<All>';
//娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
this.Clear( search.Category(), search.StartDate().DateTime(), search.EndDate().DateTime() );
- //杩囨护鍚庣殑浜у搧id
- productids := selectuniquevalues( products, Elements, product, ( search.Generation() = allunit or product.Generation() = search.Generation() )
- and ( search.MqbMlb() = allunit or product.MQBMLB() = search.MqbMlb() )
- and ( search.Power() = allunit or product.Power() = search.Power() ), product.ID() );
- sumrow := this.InventroySummaryRow( relnew, Name := 'SUM', Unit := search.Unit(), RowNr := table.InventroySummaryRow( relsize ) );
- sumrow.InitializeCell( this );
- traverse( table, InventroySummaryRow, row, row.Unit() = search.Unit() ){
- productid := construct( Strings );
- productid.Add( row.Name() );
-
- if( productids.ContainsAll( productid ) ){
- showrow := this.InventroySummaryRow( relnew, Name := row.Name(), Unit := row.Unit(), RowNr := row.RowNr() );
- traverse( this, InventorySummaryColumn, column ){
- sumcell := selectobject( column, InventorySummaryCell, c, c.InventroySummaryRow() = sumrow );
- daycells := selectset( row, InventorySummaryCell, cell, cell.InventorySummaryColumn().TimeUnit() = Translations::MP_GlobalParameters_Day() and
- cell.InventorySummaryColumn().StartDate() >= column.StartDate() and
- cell.InventorySummaryColumn().StartDate() <= column.EndaDate() );
-
- endinginventory := maxobject( daycells, Elements, e, e.InventorySummaryColumn().StartDate() ).EndingInventory();
- minimuminventory := min( daycells, Elements, e, e.MinimumInventory() );
- maximuminventory := max( daycells, Elements, e, e.MaximumInventory() );
- averageinventory := [Number]average( daycells, Elements, e, e.AverageInventory() );
-
- showcell := column.InventorySummaryCell( relnew, EndingInventory := endinginventory, MinimumInventory := minimuminventory, MaximumInventory := maximuminventory, AverageInventory := averageinventory );
- showrow.InventorySummaryCell( relinsert, showcell );
-
- sumcell.EndingInventory( sumcell.EndingInventory() + endinginventory );
- sumcell.MinimumInventory( sumcell.MinimumInventory() + minimuminventory );
- sumcell.MaximumInventory( sumcell.MaximumInventory() + maximuminventory);
- sumcell.AverageInventory( sumcell.AverageInventory() + averageinventory );
- }
- }
+ traverse( factorys, Elements, factory ){
+ this.GenerateShow( table, productids, factory.ID() );
+ }
+
+ rows := selectsortedset( this, InventroySummaryRow, row, row.Name() );
+ i := 0;
+ traverse( rows, Elements, e ){
+ e.RowNr( i );
+ i := i + 1;
}
}
*]
diff --git a/_Main/BL/Type_InventorySummaryReport/Method_GenerateColumn.qbl b/_Main/BL/Type_InventorySummaryReport/Method_GenerateColumn.qbl
index 257071d..64d6ac0 100644
--- a/_Main/BL/Type_InventorySummaryReport/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_InventorySummaryReport/Method_GenerateColumn.qbl
@@ -37,8 +37,8 @@
}else if( timeunit = Translations::MP_GlobalParameters_Month() ){
for( start := starttime; start <= endtime; start := start.StartOfNextMonth() ){
monthend := ( start.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
-
- this.InventorySummaryColumn( relnew, Name := monthend.Format( "M2/D2/Y" ).Concat( ' ' ).Concat( monthend.Format( "MM" ).Concat( '/').Concat( [String]monthend.Month() ).Concat( '鏈�' ) ), StartDate := start.Date(), EndaDate := monthend, TimeUnit := Translations::MP_GlobalParameters_Month() );
+ us_locale := Locale::Construct( 'en_us' );
+ this.InventorySummaryColumn( relnew, Name := monthend.Format( "M2/D2/Y" ).Concat( ' ' ).Concat( monthend.Format( "MM", us_locale ).Concat( '/').Concat( [String]monthend.Month() ).Concat( '鏈�' ) ), StartDate := start.Date(), EndaDate := monthend, TimeUnit := Translations::MP_GlobalParameters_Month() );
}
}
}
diff --git "a/_Main/BL/Type_InventorySummaryReport/Method_GenerateShow\043925.qbl" "b/_Main/BL/Type_InventorySummaryReport/Method_GenerateShow\043925.qbl"
new file mode 100644
index 0000000..7ed3100
--- /dev/null
+++ "b/_Main/BL/Type_InventorySummaryReport/Method_GenerateShow\043925.qbl"
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+#parent: #root
+Method GenerateShow (
+ InventorySummaryReport table,
+ Strings productids,
+ String factory
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Oct-12-2024 (created)
+ sumrow := this.InventroySummaryRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( 'SUM' ), Unit := factory );
+ sumrow.InitializeCell( this );
+ traverse( table, InventroySummaryRow, row, row.Unit() = factory ){
+ productid := construct( Strings );
+ productid.Add( row.Name() );
+
+ if( productids.ContainsAll( productid ) ){
+ showrow := this.InventroySummaryRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( row.Name() ), Unit := row.Unit(), RowNr := row.RowNr() );
+ traverse( this, InventorySummaryColumn, column ){
+ sumcell := selectobject( column, InventorySummaryCell, c, c.InventroySummaryRow() = sumrow );
+ daycells := selectset( row, InventorySummaryCell, cell, cell.InventorySummaryColumn().TimeUnit() = Translations::MP_GlobalParameters_Day() and
+ cell.InventorySummaryColumn().StartDate() >= column.StartDate() and
+ cell.InventorySummaryColumn().StartDate() <= column.EndaDate() );
+
+ endinginventory := maxobject( daycells, Elements, e, e.InventorySummaryColumn().StartDate() ).EndingInventory();
+ minimuminventory := min( daycells, Elements, e, e.MinimumInventory() );
+ maximuminventory := max( daycells, Elements, e, e.MaximumInventory() );
+ averageinventory := [Number]average( daycells, Elements, e, e.AverageInventory() );
+
+ showcell := column.InventorySummaryCell( relnew, EndingInventory := endinginventory, MinimumInventory := minimuminventory, MaximumInventory := maximuminventory, AverageInventory := averageinventory );
+ showrow.InventorySummaryCell( relinsert, showcell );
+
+ sumcell.EndingInventory( sumcell.EndingInventory() + endinginventory );
+ sumcell.MinimumInventory( sumcell.MinimumInventory() + minimuminventory );
+ sumcell.MaximumInventory( sumcell.MaximumInventory() + maximuminventory);
+ sumcell.AverageInventory( sumcell.AverageInventory() + averageinventory );
+ }
+ }
+ }
+ *]
+}
diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
index dd97f73..015ec8b 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
@@ -10,7 +10,7 @@
[*
// 鐢勫叞楦� Jun-24-2024 (created)
owner.InventorySummarySource( relflush );
- products := construct( Product_MPs );
+ productids := construct( Strings );
allunit := InventorySummaryReport::GetDefaultAllUnit();
ccunit := InventorySummaryReport::GetDefaultCCUnit();
dlunit := InventorySummaryReport::GetDefaultDLUnit();
@@ -35,6 +35,7 @@
isdl := exists( parentunits, Elements, punit, punit.ID().StartsWith( 'VWED DL' ) );
if( iscc or isdl ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() ){
+ productids.Add( pisp.ProductID() );
//鑾峰彇宸ュ巶琛�
factoryrow := table.GetRow( ifexpr( iscc, ccunit, dlunit ), pisp.ProductID() );
//鑾峰彇鍚堣琛�
@@ -44,7 +45,6 @@
and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day(), pispip.Start() );
traverse( pispips, Elements, pispip ){
- products.Add( pisp.Product_MP() );
period := pispip.Period_MP();
periodtime := period.Start().Date();
// periodname := periodtime.Format( "M2/D2/Y" );
@@ -75,10 +75,11 @@
}
//鍐嶅湪搴撳瓨鏇存柊鐨勫瓙鐣岄潰搴撳瓨鐐归�夋嫨涓壘鍒拌繖浜涘簱瀛樼偣鎵�鍏宠仈鐨勫凡鍕鹃�夊簱浣�
selections := selectset( interface, InventoryPointSelection, selection, allsps.Find( selection.StockpoingPoint() ) >= 0 and selection.IsIncluded() );
- productids := selectuniquevalues( selections, Elements, selection, selection.ProductID() );
+ productidset := selectuniquevalues( selections, Elements, selection, selection.ProductID() );
//鏈�鍚庡皢杩欎簺搴撲綅涓浂浠跺彿鐨勬暟閲忚繘琛屽姞鎬�
traverse( table, InventorySummaryColumn, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() < startofplanning.Date() ){
- traverse( productids, Elements, productid ){
+ traverse( productidset, Elements, productid ){
+ productids.Add( productid );
column.GenerateCell( selections, ccsps, dlsps, table, column.StartDate(), column.EndaDate(), productid, allunit, ccunit, dlunit );
}
}
@@ -94,6 +95,8 @@
e.Delete();
}
}
- showtable.Generate( search, products );
+
+ factorys := selectset( owner, Factory, factory, factory.ID() = FinancialProductionReport::GetDefaultAllUnit() );
+ showtable.Generate( search, factorys, productids );
*]
}
diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl
index 4003115..38b40e6 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl
@@ -23,8 +23,9 @@
}
table := selectobject( owner, InventorySummarySource.InventorySummaryReport, table, table.IsShow() );
if( not isnull( table ) ){
- products := selectset( owner, Product_MP, product, true );
- table.Generate( search, products );
+ factorys := selectset( owner, Factory, factory, factory.ID() = FinancialProductionReport::GetDefaultAllUnit() );
+ productids := selectuniquevalues( table, InventroySummaryRow, row, row.Name() );
+ table.Generate( search, factorys, productids );
}
return table;
*]
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_EndDate.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_EndDate.qbl
new file mode 100644
index 0000000..48949e6
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_EndDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[413988.0.1603460249][413988.0.1603460248][413988.0.1603460250]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_InventoryWeight.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_InventoryWeight.qbl
new file mode 100644
index 0000000..1abba91
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_InventoryWeight.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute InventoryWeight
+{
+ #keys: '3[413988.0.1606610060][413988.0.1606610059][413988.0.1606610061]'
+ Description: '鍓╀綑搴撳瓨 - 鏈�灏忓簱瀛�'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_Order.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_Order.qbl
new file mode 100644
index 0000000..67e6252
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_Order.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Order
+{
+ #keys: '3[413988.0.1603460357][413988.0.1603460356][413988.0.1603460358]'
+ Description: '鐢熶骇椤哄簭锛圫tring锛�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_OrderNr.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_OrderNr.qbl
new file mode 100644
index 0000000..b356ade
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_OrderNr.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderNr
+{
+ #keys: '3[413988.0.1607288352][413988.0.1607288351][413988.0.1607288353]'
+ Description: '鐢熶骇椤哄簭锛圢umber锛�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_Quantity.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_Quantity.qbl
new file mode 100644
index 0000000..4a1087a
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_Quantity.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Quantity
+{
+ #keys: '3[413988.0.1603460347][413988.0.1603460346][413988.0.1603460348]'
+ Description: '鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternEnd.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternEnd.qbl
new file mode 100644
index 0000000..7f0b7ba
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternEnd.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ShiftPatternEnd
+{
+ #keys: '3[413988.0.1603460415][413988.0.1603460414][413988.0.1603460416]'
+ Description: '鐝缁撴潫鏃堕棿'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternName.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternName.qbl
new file mode 100644
index 0000000..be9fc09
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternName.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ShiftPatternName
+{
+ #keys: '3[413988.0.1603460389][413988.0.1603460388][413988.0.1603460390]'
+ Description: '鐝鍚�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternStart.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternStart.qbl
new file mode 100644
index 0000000..42d8002
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_ShiftPatternStart.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ShiftPatternStart
+{
+ #keys: '3[413988.0.1603460402][413988.0.1603460401][413988.0.1603460403]'
+ Description: '鐝寮�濮嬫椂闂�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_StartDate.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_StartDate.qbl
new file mode 100644
index 0000000..3a89c81
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_StartDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[413988.0.1603460239][413988.0.1603460238][413988.0.1603460240]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Attribute_TotalQuantity.qbl b/_Main/BL/Type_NewOfflinePlanCell/Attribute_TotalQuantity.qbl
new file mode 100644
index 0000000..664619a
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Attribute_TotalQuantity.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute TotalQuantity
+{
+ #keys: '3[413988.0.1603460379][413988.0.1603460378][413988.0.1603460380]'
+ Description: '鍚堣'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Function_CalcEndDate.qbl b/_Main/BL/Type_NewOfflinePlanCell/Function_CalcEndDate.qbl
new file mode 100644
index 0000000..8b47662
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Function_CalcEndDate.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcEndDate
+{
+ TextBody:
+ [*
+ // lihongji Oct-11-2024 (created)
+
+ value := guard( this.NewOfflinePlanColumn().EndDate(), Date::MinDate() );
+
+ this.EndDate( value );
+ *]
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Function_CalcStartDate.qbl b/_Main/BL/Type_NewOfflinePlanCell/Function_CalcStartDate.qbl
new file mode 100644
index 0000000..4b8214e
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Function_CalcStartDate.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcStartDate
+{
+ TextBody:
+ [*
+ // lihongji Oct-11-2024 (created)
+
+ value := guard( this.NewOfflinePlanColumn().StartDate(), Date::MinDate() );
+
+ this.StartDate( value );
+ *]
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/Function_CalcTotalQuantity.qbl b/_Main/BL/Type_NewOfflinePlanCell/Function_CalcTotalQuantity.qbl
new file mode 100644
index 0000000..f483fbe
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/Function_CalcTotalQuantity.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcTotalQuantity
+{
+ TextBody:
+ [*
+ // lihongji Oct-11-2024 (created)
+
+ value := sum( this, Detailed, tempNOPC, true, tempNOPC.Quantity() );
+
+ this.TotalQuantity( value );
+ *]
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl
new file mode 100644
index 0000000..1d7eafb
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl
@@ -0,0 +1,93 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod RefreshOfflinePlan (
+ MacroPlan macroPlan
+)
+{
+ TextBody:
+ [*
+ macroPlan.NewOfflinePlanTable( relflush );
+
+ nopt := macroPlan.NewOfflinePlanTable( relnew, SaveDateTime := DateTime::ActualTime() );
+
+ // 鐢熸垚涓嬬嚎璁″垝琛ㄣ�愪竴鏉′骇绾垮湪鍚屼竴澶╀笉浼氫骇鐢熶袱娆＄浉鍚屼骇鍝佺殑鍛ㄦ湡浠诲姟銆�
+ traverse ( macroPlan, Unit, u, u.HasCapacityTypeTime()
+ // and u.Name() = "eMotor Assy (France)" // 娴嬭瘯鏈湴鍦烘櫙鏃跺彲浠ヨ繃婊�
+ // and u.Name() = "DL-MoMo" // 娴嬭瘯瀹為檯鍦烘櫙鏃跺彲浠ヨ繃婊�
+ )
+ {
+ // 寰幆閬嶅巻鍛ㄦ湡浠诲姟鐨凬ewSupply銆愮敓鎴愭槑缁嗕笅绾胯鍒掋��
+ traverse ( u, Operation, o ) {
+ traverse ( o, PeriodTaskOperation.NewSupply, ns ) {
+ // ProductInStockingPoint_MP
+ pisp := ns.AsProductionSupply().ProductInStockingPoint_MP();
+ // ProductInStockingPointInPeriodPlanningLeaf
+ pispippl := ns.ProductInStockingPointInPeriodPlanningLeaf();
+ // Period_MP
+ pmp := pispippl.Period_MP();
+ // ShiftPattern
+ sp := ns.PeriodTask_MP().UnitPeriod().astype( UnitPeriodTimeBase ).ShiftPattern();
+ // ShiftDayTime
+ sdt := select( sp, ShiftDayTime, tempSDT, tempSDT.Name() = tempSDT.ShiftPattern().Name() );
+
+ // 鐢熸垚涓嬬嚎璁″垝銆愪骇绾挎槑缁嗐�戣
+ detailedNOPR := select( nopt, NewOfflinePlanRow, tempNOPR, tempNOPR.ProductionLine() = u.ID() and tempNOPR.ProductID() = pisp.ProductID() and tempNOPR.Type() = "1" );
+ if ( isnull( detailedNOPR ) ) {
+ detailedNOPR := nopt.NewOfflinePlanRow( relnew, ProductionLine := u.ID(), ProductID := pisp.ProductID(), Type := "1" );
+ }
+
+ // 鐢熸垚涓嬬嚎璁″垝鍒�
+ nopc := select( nopt, NewOfflinePlanColumn, tempNOPC, tempNOPC.StartDate() = pmp.StartDate() and tempNOPC.EndDate() = pmp.EndDate() );
+ if ( isnull( nopc ) ) {
+ nopc := nopt.NewOfflinePlanColumn( relnew, StartDate := pmp.StartDate(), EndDate := pmp.EndDate() );
+ }
+
+ // 鐢熸垚涓嬬嚎璁″垝銆愪骇绾挎槑缁嗐�戝崟鍏冩牸
+ detaileNOPCell := select( detailedNOPR, NewOfflinePlanCell, tempNOPCell, tempNOPCell.NewOfflinePlanColumn() = nopc );
+ if ( isnull ( detaileNOPCell ) ) {
+ detaileNOPCell := detailedNOPR.NewOfflinePlanCell( relnew,
+ Quantity := ns.Quantity().Round( 0 ),
+ InventoryWeight := pispippl.InventoryLevelEnd() - pispippl.MinInventoryLevel(),
+ ShiftPatternName := guard( sdt.Name(), "" ),
+ ShiftPatternStart := guard( sdt.StartDateTime().Format( "H:m" ), "" ),
+ ShiftPatternEnd := guard( sdt.EndDateTIme().Format( "H:m" ), "" ) );
+ detaileNOPCell.NewOfflinePlanColumn( relset, nopc );
+ }
+ }
+ }
+
+ // 璁剧疆鐢熶骇椤哄簭銆愬涓嬬嚎璁″垝鏄庣粏鐢熸晥銆�
+
+
+ // 銆愮敓鎴愬悎璁′笅绾胯鍒掋��
+ totalNOPR := nopt.NewOfflinePlanRow( relnew, ProductID := "All", ProductionLine := u.ID(), Type := "2" );
+ detailNOPRs := selectset( nopt, NewOfflinePlanRow, tempNOPR, tempNOPR.ProductionLine() = u.ID() and tempNOPR.Type() = "1" );
+ traverse ( detailNOPRs, Elements, detailNOPR ) {
+ traverse ( detailNOPR, NewOfflinePlanCell, detailNOPCell ) {
+ // 鐢熶骇涓嬬嚎璁″垝銆愪骇绾垮悎璁°�戝崟鍏冩牸
+ totalNOPRCell := select( totalNOPR, NewOfflinePlanCell, tempNOPCell, tempNOPCell.NewOfflinePlanColumn() = detailNOPCell.NewOfflinePlanColumn() );
+ if ( isnull( totalNOPRCell ) ) {
+ totalNOPRCell := totalNOPR.NewOfflinePlanCell( relnew );
+ totalNOPRCell.NewOfflinePlanColumn( relset, detailNOPCell.NewOfflinePlanColumn() ); // 璁剧疆鍒�
+ // 灏嗘槑缁嗗崟鍏冩牸鍏宠仈鍒板悎璁″崟鍏冩牸
+ totalNOPRCell.Detailed( relinsert, detailNOPCell );
+ } else {
+ // 灏嗘槑缁嗗崟鍏冩牸鍏宠仈鍒板悎璁″崟鍏冩牸
+ totalNOPRCell.Detailed( relinsert, detailNOPCell );
+ }
+ }
+ }
+
+ // 琛ラ綈绌烘牸瀛�
+ traverse ( nopt, NewOfflinePlanRow, nopr ) {
+ traverse ( nopt, NewOfflinePlanColumn, nopc ) {
+ cell := select( nopr, NewOfflinePlanCell, tempNOPCell, tempNOPCell.NewOfflinePlanColumn() = nopc );
+ if ( isnull( cell ) ) {
+ cell := nopr.NewOfflinePlanCell( relnew );
+ cell.NewOfflinePlanColumn( relset, nopc );
+ }
+ }
+ }
+ }
+ *]
+}
diff --git a/_Main/BL/Type_NewOfflinePlanCell/_ROOT_Type_NewOfflinePlanCell.qbl b/_Main/BL/Type_NewOfflinePlanCell/_ROOT_Type_NewOfflinePlanCell.qbl
new file mode 100644
index 0000000..4bb9f4a
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanCell/_ROOT_Type_NewOfflinePlanCell.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type NewOfflinePlanCell
+{
+ #keys: '5[413988.0.1603460079][413988.0.1603460077][0.0.0][413988.0.1603460078][413988.0.1603460080]'
+ BaseType: Object
+ Description: '涓嬬嚎璁″垝鍗曞厓鏍�'
+ StructuredName: 'NewOfflinePlanCells'
+}
diff --git a/_Main/BL/Type_NewOfflinePlanColumn/Attribute_EndDate.qbl b/_Main/BL/Type_NewOfflinePlanColumn/Attribute_EndDate.qbl
new file mode 100644
index 0000000..87a6355
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanColumn/Attribute_EndDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[413988.0.1603460170][413988.0.1603460169][413988.0.1603460171]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_NewOfflinePlanColumn/Attribute_StartDate.qbl b/_Main/BL/Type_NewOfflinePlanColumn/Attribute_StartDate.qbl
new file mode 100644
index 0000000..60c31e0
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanColumn/Attribute_StartDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[413988.0.1603460160][413988.0.1603460159][413988.0.1603460161]'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_NewOfflinePlanColumn/_ROOT_Type_NewOfflinePlanColumn.qbl b/_Main/BL/Type_NewOfflinePlanColumn/_ROOT_Type_NewOfflinePlanColumn.qbl
new file mode 100644
index 0000000..d221eaf
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanColumn/_ROOT_Type_NewOfflinePlanColumn.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type NewOfflinePlanColumn
+{
+ #keys: '5[413988.0.1603460074][413988.0.1603460072][0.0.0][413988.0.1603460073][413988.0.1603460075]'
+ BaseType: Object
+ Description: '涓嬬嚎璁″垝鍒�'
+ StructuredName: 'NewOfflinePlanColumns'
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/Attribute_Name.qbl b/_Main/BL/Type_NewOfflinePlanRow/Attribute_Name.qbl
new file mode 100644
index 0000000..4dc081e
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/Attribute_Name.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Name
+{
+ #keys: '3[413988.0.1607288491][413988.0.1607288490][413988.0.1607288492]'
+ Description: '鏄剧ず鍚�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductID.qbl b/_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductID.qbl
new file mode 100644
index 0000000..9ff8ffb
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductID.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductID
+{
+ #keys: '3[413988.0.1603460321][413988.0.1603460320][413988.0.1603460322]'
+ Description: '浜у搧ID'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductionLine.qbl b/_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductionLine.qbl
new file mode 100644
index 0000000..369ad26
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/Attribute_ProductionLine.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ProductionLine
+{
+ #keys: '3[413988.0.1603460311][413988.0.1603460310][413988.0.1603460312]'
+ Description: '浜х嚎鍚�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/Attribute_Type.qbl b/_Main/BL/Type_NewOfflinePlanRow/Attribute_Type.qbl
new file mode 100644
index 0000000..4c444e9
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/Attribute_Type.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Type
+{
+ #keys: '3[413988.0.1603460334][413988.0.1603460333][413988.0.1603460335]'
+ Description:
+ [*
+ 1锛氭槑缁嗘樉绀�
+
+ 2锛氬悎璁℃樉绀�
+ *]
+ ValueType: String
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/Function_CalcName.qbl b/_Main/BL/Type_NewOfflinePlanRow/Function_CalcName.qbl
new file mode 100644
index 0000000..92e3125
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/Function_CalcName.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcName
+{
+ TextBody:
+ [*
+ // lihongji Oct-12-2024 (created)
+
+ value := this.ProductionLine() + ifexpr( this.ProductID() = "All", "", "_" + this.ProductID() );
+
+ this.Name( value );
+ *]
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/Method_Filter.qbl b/_Main/BL/Type_NewOfflinePlanRow/Method_Filter.qbl
new file mode 100644
index 0000000..d5e399d
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/Method_Filter.qbl
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Method Filter (
+ Entitys entitys
+) declarative remote as Boolean
+{
+ TextBody:
+ [*
+ flag := false;
+
+ traverse ( entitys, Elements.astype( Unit ), u, not flag ) {
+ flag := u.Name() = this.ProductionLine();
+ }
+
+ return flag;
+ *]
+}
diff --git a/_Main/BL/Type_NewOfflinePlanRow/_ROOT_Type_NewOfflinePlanRow.qbl b/_Main/BL/Type_NewOfflinePlanRow/_ROOT_Type_NewOfflinePlanRow.qbl
new file mode 100644
index 0000000..fd71fdd
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanRow/_ROOT_Type_NewOfflinePlanRow.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type NewOfflinePlanRow
+{
+ #keys: '5[413988.0.1603460069][413988.0.1603460067][0.0.0][413988.0.1603460068][413988.0.1603460070]'
+ BaseType: Object
+ Description: '涓嬬嚎璁″垝琛�'
+ StructuredName: 'NewOfflinePlanRows'
+}
diff --git a/_Main/BL/Type_NewOfflinePlanTable/Attribute_SaveDateTime.qbl b/_Main/BL/Type_NewOfflinePlanTable/Attribute_SaveDateTime.qbl
new file mode 100644
index 0000000..759519d
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanTable/Attribute_SaveDateTime.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SaveDateTime
+{
+ #keys: '3[413988.0.1603460037][413988.0.1603460036][413988.0.1603460038]'
+ Description: '淇濆瓨鑽夌鐨勬椂闂�'
+ ValueType: DateTime
+}
diff --git a/_Main/BL/Type_NewOfflinePlanTable/_ROOT_Type_NewOfflinePlanTable.qbl b/_Main/BL/Type_NewOfflinePlanTable/_ROOT_Type_NewOfflinePlanTable.qbl
new file mode 100644
index 0000000..b83130c
--- /dev/null
+++ b/_Main/BL/Type_NewOfflinePlanTable/_ROOT_Type_NewOfflinePlanTable.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type NewOfflinePlanTable
+{
+ #keys: '5[413988.0.1603460031][413988.0.1603460029][0.0.0][413988.0.1603460030][413988.0.1603460032]'
+ BaseType: Object
+ StructuredName: 'NewOfflinePlanTables'
+}
diff --git a/_Main/BL/Type_ProductGeneration/Attribute_Generation.qbl b/_Main/BL/Type_ProductGeneration/Attribute_Generation.qbl
new file mode 100644
index 0000000..374ccf3
--- /dev/null
+++ b/_Main/BL/Type_ProductGeneration/Attribute_Generation.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Generation
+{
+ #keys: '3[415136.0.1188500025][415136.0.1188500024][415136.0.1188500026]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_ProductGeneration/StaticMethod_Initilize.qbl b/_Main/BL/Type_ProductGeneration/StaticMethod_Initilize.qbl
new file mode 100644
index 0000000..67f8c2b
--- /dev/null
+++ b/_Main/BL/Type_ProductGeneration/StaticMethod_Initilize.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Initilize (
+ MacroPlan owner
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Oct-12-2024 (created)
+ owner.ProductGeneration( relflush );
+ generations := selectuniquevalues( owner, Product_MP, product, product.Generation() );
+ traverse( generations, Elements, e, e <> '' ){
+ owner.ProductGeneration( relnew, Generation := e );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_ProductGeneration/_ROOT_Type_ProductGeneration.qbl b/_Main/BL/Type_ProductGeneration/_ROOT_Type_ProductGeneration.qbl
new file mode 100644
index 0000000..75d4713
--- /dev/null
+++ b/_Main/BL/Type_ProductGeneration/_ROOT_Type_ProductGeneration.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type ProductGeneration
+{
+ #keys: '5[415136.0.1188500006][415136.0.1188500004][0.0.0][415136.0.1188500005][415136.0.1188500007]'
+ BaseType: Object
+ Description: '浜у搧Generation'
+ StructuredName: 'ProductGenerations'
+}
diff --git a/_Main/BL/Type_ProductMLBMQB/Attribute_MLBMQB.qbl b/_Main/BL/Type_ProductMLBMQB/Attribute_MLBMQB.qbl
new file mode 100644
index 0000000..3d7b976
--- /dev/null
+++ b/_Main/BL/Type_ProductMLBMQB/Attribute_MLBMQB.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MLBMQB
+{
+ #keys: '3[415136.0.1188500042][415136.0.1188500041][415136.0.1188500043]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_ProductMLBMQB/StaticMethod_Initilize.qbl b/_Main/BL/Type_ProductMLBMQB/StaticMethod_Initilize.qbl
new file mode 100644
index 0000000..37fbd4a
--- /dev/null
+++ b/_Main/BL/Type_ProductMLBMQB/StaticMethod_Initilize.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Initilize (
+ MacroPlan owner
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Oct-12-2024 (created)
+ owner.ProductMLBMQB( relflush );
+ mlbmqbs := selectuniquevalues( owner, Product_MP, product, product.MQBMLB() );
+ traverse( mlbmqbs, Elements, e, e <> '' ){
+ owner.ProductMLBMQB( relnew, MLBMQB := e );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_ProductMLBMQB/_ROOT_Type_ProductMLBMQB.qbl b/_Main/BL/Type_ProductMLBMQB/_ROOT_Type_ProductMLBMQB.qbl
new file mode 100644
index 0000000..8dd3112
--- /dev/null
+++ b/_Main/BL/Type_ProductMLBMQB/_ROOT_Type_ProductMLBMQB.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type ProductMLBMQB
+{
+ #keys: '5[415136.0.1188500039][415136.0.1188500037][0.0.0][415136.0.1188500038][415136.0.1188500040]'
+ BaseType: Object
+ Description: '浜у搧MLBMQB'
+ StructuredName: 'ProductMLBMQBs'
+}
diff --git a/_Main/BL/Type_ProductPower/Attribute_Power.qbl b/_Main/BL/Type_ProductPower/Attribute_Power.qbl
new file mode 100644
index 0000000..224ea36
--- /dev/null
+++ b/_Main/BL/Type_ProductPower/Attribute_Power.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Power
+{
+ #keys: '3[415136.0.1188465582][415136.0.1188465581][415136.0.1188465583]'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_ProductPower/StaticMethod_Initilize.qbl b/_Main/BL/Type_ProductPower/StaticMethod_Initilize.qbl
new file mode 100644
index 0000000..fc82418
--- /dev/null
+++ b/_Main/BL/Type_ProductPower/StaticMethod_Initilize.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Initilize (
+ MacroPlan owner
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Oct-12-2024 (created)
+ owner.ProductPower( relflush );
+ powers := selectuniquevalues( owner, Product_MP, product, product.Power() );
+ traverse( powers, Elements, e, e <> '' ){
+ owner.ProductPower( relnew, Power := e );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_ProductPower/_ROOT_Type_ProductPower.qbl b/_Main/BL/Type_ProductPower/_ROOT_Type_ProductPower.qbl
new file mode 100644
index 0000000..107759a
--- /dev/null
+++ b/_Main/BL/Type_ProductPower/_ROOT_Type_ProductPower.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type ProductPower
+{
+ #keys: '5[415136.0.1188465579][415136.0.1188465577][0.0.0][415136.0.1188465578][415136.0.1188465580]'
+ BaseType: Object
+ Description: '浜у搧Power'
+ StructuredName: 'ProductPowers'
+}
diff --git a/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp b/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp
index b9d0d71..cd90a20 100644
--- a/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp
+++ b/_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp
@@ -7,9 +7,9 @@
AttributeKey: '[415136.0.1160240044]'
Synonym: '鎬昏垂鐢�'
}
- AttributeRepresentation Coefficient
+ AttributeRepresentation CoefficientValue
{
- AttributeKey: '[415136.0.986844757]'
+ AttributeKey: '[415136.0.1188511346]'
Synonym: '绯绘暟'
}
AttributeRepresentation EstimateTotalCost
diff --git a/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp b/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp
index 9fbd9c5..047ceef 100644
--- a/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp
+++ b/_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp
@@ -32,9 +32,9 @@
AttributeKey: '[415136.0.1160164779]'
Synonym: '闀挎槬鐭�旇繍杈撹垂鐢�'
}
- AttributeRepresentation Coefficient
+ AttributeRepresentation CoefficientValue
{
- AttributeKey: '[415136.0.992900035]'
+ AttributeKey: '[415136.0.1188511355]'
Synonym: '绯绘暟'
}
AttributeRepresentation DLRentInCost
diff --git a/_Main/Sys/Repr/Global/FinancialProductionCell.qrp b/_Main/Sys/Repr/Global/FinancialProductionCell.qrp
new file mode 100644
index 0000000..39489a8
--- /dev/null
+++ b/_Main/Sys/Repr/Global/FinancialProductionCell.qrp
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: #root
+TypeRepresentation FinancialProductionCell
+{
+ AttributeRepresentation Value
+ {
+ AttributeKey: '[415136.0.834715166]'
+ Conditional:
+ [
+ DataRepresentation.Conditional
+ {
+ BackgroundColor: '$FF6666'
+ ConditionBody: 'object.IsUpdate()'
+ ConversionBody: ''
+ DefaultBackgroundColor: false
+ InheritConversion: false
+ }
+ ]
+ }
+ RelationRepresentation AsFirstCellInColumn { RelationKey: '[415136.0.834715218]' Visibility: 'Normal' }
+}
diff --git a/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp b/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp
new file mode 100644
index 0000000..e2b939c
--- /dev/null
+++ b/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: #root
+TypeRepresentation NewOfflinePlanCell
+{
+ AttributeRepresentation ShiftPatternEnd
+ {
+ AttributeKey: '[413988.0.1603460414]'
+ Synonym: '鐝缁撴潫鏃堕棿'
+ }
+ AttributeRepresentation ShiftPatternName
+ {
+ AttributeKey: '[413988.0.1603460388]'
+ Synonym: '鐝'
+ }
+ AttributeRepresentation ShiftPatternStart
+ {
+ AttributeKey: '[413988.0.1603460401]'
+ Synonym: '鐝寮�濮嬫椂闂�'
+ }
+ AttributeRepresentation TotalQuantity
+ {
+ AttributeKey: '[413988.0.1603460378]'
+ Synonym: '鎬婚噺'
+ }
+ RelationRepresentation AsFirstNOPCell { RelationKey: '[413988.0.1603460270]' Visibility: 'Normal' }
+}
diff --git a/_Main/Sys/Repr/Global/ProductInStockingPointInPeriod.qrp b/_Main/Sys/Repr/Global/ProductInStockingPointInPeriod.qrp
index b4bc4a0..9b488a8 100644
--- a/_Main/Sys/Repr/Global/ProductInStockingPointInPeriod.qrp
+++ b/_Main/Sys/Repr/Global/ProductInStockingPointInPeriod.qrp
@@ -459,4 +459,5 @@
InheritFormatting: false
}
}
+ RelationRepresentation ActualPISPIPAsWithinPeriod { RelationKey: '[137118.0.348745522]' Visibility: 'Normal' }
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
index 36b4beb..8a7c394 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
@@ -22,7 +22,7 @@
BaseType: 'WebButton'
Properties:
[
- Taborder: 5
+ Taborder: 6
]
}
Component bOfflinePlan
@@ -45,7 +45,7 @@
Description: 'AssemblyOnlinePlan'
Image: 'PALM_TREE'
Label: 'Filing plan'
- Taborder: 2
+ Taborder: 3
]
}
Component bPackagingPlan
@@ -56,7 +56,7 @@
[
Image: 'SIXPACK_BEER'
Label: 'Packaging plan'
- Taborder: 3
+ Taborder: 4
]
}
Component bShippingActualData
@@ -67,7 +67,18 @@
[
Image: 'TABLE_CONNECTION'
Label: 'Shipping data'
- Taborder: 4
+ Taborder: 5
+ ]
+ }
+ Component bNewOfflinePlan
+ {
+ #keys: '[413988.0.1607471411]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'LIGHTBULB'
+ Label: 'Output plan'
+ Taborder: 2
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick.def
new file mode 100644
index 0000000..c15a91d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: abgSecondDevelopmentPlan/bNewOfflinePlan
+Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick
+{
+ #keys: '[413988.0.1607471572]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ ApplicationScope.ViewManager().ResetUserViewById( "NewOfflinePlan", true );
+ *]
+ }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Component_pnlLeft\04388.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Component_pnlLeft\04388.def"
index 48c5652..1567971 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Component_pnlLeft\04388.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Component_pnlLeft\04388.def"
@@ -44,63 +44,7 @@
[
Checked: true
Label: '鏄惁婵�娲荤増鏈�'
- Taborder: 8
- ]
- }
- Component ddlOriginMacroPlan
- {
- #keys: '[415136.0.1043064647]'
- BaseType: 'WebDropDownList'
- Databinding: 'ScenarioMP'
- Children:
- [
- Component deMacroPlan id:deMacroPlan_640
- {
- #keys: '[415136.0.1043064648]'
- BaseType: 'WebDataExtractor'
- Properties:
- [
- DataType: 'ScenarioManager'
- Source: 'ScenarioManager'
- Taborder: 0
- Transformation: 'ScenarioMP'
- ]
- }
- ]
- Properties:
- [
- DisplayField: 'Name'
- Label: '浠庣増鏈�'
- Taborder: 4
- Visible: false
- ]
- }
- Component ddlDestinationMacroPlan
- {
- #keys: '[415136.0.1043064790]'
- BaseType: 'WebDropDownList'
- Databinding: 'ScenarioMP'
- Children:
- [
- Component deMacroPlan950
- {
- #keys: '[415136.0.1043064791]'
- BaseType: 'WebDataExtractor'
- Properties:
- [
- DataType: 'ScenarioManager'
- Source: 'ScenarioManager'
- Taborder: 0
- Transformation: 'ScenarioMP'
- ]
- }
- ]
- Properties:
- [
- DisplayField: 'Name'
- Label: '鍒扮増鏈�'
Taborder: 6
- Visible: false
]
}
Component efVersionFrom
@@ -110,7 +54,7 @@
Properties:
[
Label: '浠庣増鏈�'
- Taborder: 5
+ Taborder: 4
]
}
Component efVersionTo
@@ -120,7 +64,7 @@
Properties:
[
Label: '鍒扮増鏈�'
- Taborder: 7
+ Taborder: 5
]
}
Component ddslFactory
@@ -129,6 +73,7 @@
BaseType: 'WebDropDownStringList'
Properties:
[
+ InitialValue: 'all;8200;8201'
Label: '宸ュ巶浠ｇ爜'
Strings: 'All;DL;CC'
Taborder: 1
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Component_pnlLeft.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Component_pnlLeft.def
index 8940313..9065511 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Component_pnlLeft.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Component_pnlLeft.def
@@ -36,44 +36,28 @@
Taborder: 4
]
}
- Component ddlMacroPlan
- {
- #keys: '[415136.0.1043063334]'
- BaseType: 'WebDropDownList'
- Databinding: 'ScenarioMP'
- Children:
- [
- Component deMacroPlan
- {
- #keys: '[415136.0.1043063336]'
- BaseType: 'WebDataExtractor'
- Properties:
- [
- DataType: 'ScenarioManager'
- Source: 'ScenarioManager'
- Taborder: 0
- Transformation: 'ScenarioMP'
- ]
- }
- ]
- Properties:
- [
- DisplayField: 'Name'
- Label: '鐗堟湰'
- Taborder: 2
- ]
- }
Component ddslFactory id:ddslFactory_424
{
#keys: '[415136.0.1047641312]'
BaseType: 'WebDropDownStringList'
Properties:
[
+ InitialValue: 'all;8200;8201'
Label: '宸ュ巶浠ｇ爜'
Strings: 'All;DL;CC'
Taborder: 1
]
}
+ Component efVersion
+ {
+ #keys: '[415136.0.1184400599]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ Label: '鐗堟湰'
+ Taborder: 2
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
index 83c953c..f948597 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
@@ -6,11 +6,7 @@
Body:
[*
Form.ApplyChanges();
- componentmds := ApplicationScope.ComponentMDS();
- mdsinstance := select( componentmds, ComponentMDSKinds.ComponentMDSInstances, m, m.MDSID().MDSKey() = ddlMacroPlan.Data().DatasetMDSID() );
- handle := mdsinstance.GetMDSHandle()
- macroplan := handle.AsMacroPlan();
- AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, ddslFactory.Text(), macroplan, dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName() );
+ AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, ddslFactory.Text(), efVersion.Text(), dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName() );
WebMessageBox::Success( "鎺ㄩ�佹垚鍔燂紒" );
Form.Close();
*]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def"
index 2264baf..7df6c8b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable\043358.def"
@@ -26,7 +26,7 @@
]
Properties:
[
- Attributes: 'RentInCost;RentOutOfCost;WerkToRentTransCost;RentStorCost;EstimateTotalCost;Coefficient;AllCost'
+ Attributes: 'RentInCost;RentOutOfCost;WerkToRentTransCost;RentStorCost;EstimateTotalCost;CoefficientValue;AllCost'
Column: 'Column'
Row: 'Row'
Taborder: 0
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
index 39a10dd..7cda122 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
@@ -4,8 +4,8 @@
CCEngineLogisticsCostRow row,
CCEngineLogisticsCostColumn column,
CCEngineLogisticsCostCell cell,
- Number value,
- Number oldvalue
+ String value,
+ String oldvalue
) id:Response_MatrixEditorTable_358_OnUpdateValue
{
#keys: '[415136.0.989501207]'
@@ -16,14 +16,14 @@
Body:
[*
table := selectobject( MacroPlan, CCEngineLogisticsCostReport, report, not report.IsShow() );
- cell.Coefficient( value );
+ cell.CoefficientValue( value );
traverse( table, Row, trow, trow.Name() = row.Name() ){
traverse( trow, Cell, tcel, tcel.Column().Name() = column.Name() ){
tcel.RentInCost( cell.RentInCost() );
tcel.RentOutOfCost( cell.RentOutOfCost() );
tcel.WerkToRentTransCost( cell.WerkToRentTransCost() );
tcel.RentStorCost( cell.RentStorCost() );
- tcel.Coefficient( cell.Coefficient() );
+ tcel.CoefficientValue( cell.CoefficientValue() );
}
}
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_PanelExport_670_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_PanelExport_670_ButtonSearch_OnClick.def
index 0396f68..b443ebd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_PanelExport_670_ButtonSearch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_PanelExport_670_ButtonSearch_OnClick.def
@@ -9,7 +9,9 @@
{
Body:
[*
- DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ if( not isnull( DataHolderTable.Data() ) ){
+ DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def
index bb6c8c4..87d05a8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def
@@ -26,7 +26,7 @@
]
Properties:
[
- Attributes: 'CCRentInCost;CCRentOutOfCost;CCLongTransCost;CCShorTransCost;CCRentStorCost;DLRentInCost;DLRentOutOfCost;WerkToDLRentTransCost;DLRentStorCost;DLRentOtherCost;EstimateTotalCost;Coefficient;AllCost'
+ Attributes: 'CCRentInCost;CCRentOutOfCost;CCLongTransCost;CCShorTransCost;CCRentStorCost;DLRentInCost;DLRentOutOfCost;WerkToDLRentTransCost;DLRentStorCost;DLRentOtherCost;EstimateTotalCost;CoefficientValue;AllCost'
Column: 'Column'
Row: 'Row'
Taborder: 0
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_MatrixEditorTable_OnUpdateValue.def b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_MatrixEditorTable_OnUpdateValue.def
index 70dd20a..d14c74f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_MatrixEditorTable_OnUpdateValue.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_MatrixEditorTable_OnUpdateValue.def
@@ -4,8 +4,8 @@
DLEngineLogisticsCostRow row,
DLEngineLogisticsCostColumn column,
DLEngineLogisticsCostCell cell,
- Number value,
- Number oldvalue
+ String value,
+ String oldvalue
) id:Response_MatrixEditorTable_OnUpdateValue
{
#keys: '[415136.0.992750480]'
@@ -16,17 +16,23 @@
Body:
[*
table := selectobject( MacroPlan, DLEngineLogisticsCostReport, report, not report.IsShow() );
- info( focusedattribute );
- //cell.Coefficient( value );
- //traverse( table, Row, trow, trow.Name() = row.Name() ){
- // traverse( trow, Cell, tcel, tcel.Column().Name() = column.Name() ){
- // tcel.RentEnterCost( cell.RentEnterCost() );
- // tcel.RentOutCost( cell.RentOutCost() );
- // tcel.FactoryToRentTransCost( cell.FactoryToRentTransCost() );
- // tcel.RentStorageCost( cell.RentStorageCost() );
- // tcel.Coefficient( cell.Coefficient() );
- // }
- //}
+ //info( focusedattribute );
+ cell.CoefficientValue( value );
+ traverse( table, Row, trow, trow.Name() = row.Name() ){
+ traverse( trow, Cell, tcel, tcel.Column().Name() = column.Name() ){
+ tcel.CCRentInCost( cell.CCRentInCost() );
+ tcel.CCRentOutOfCost( cell.CCRentOutOfCost() );
+ tcel.CCLongTransCost( cell.CCLongTransCost() );
+ tcel.CCRentStorCost( cell.CCRentStorCost() );
+ tcel.CCShorTransCost( cell.CCShorTransCost() );
+ tcel.DLRentInCost( cell.DLRentInCost() );
+ tcel.DLRentOutOfCost( cell.DLRentOutOfCost() );
+ tcel.DLRentOtherCost( cell.DLRentOtherCost() );
+ tcel.DLRentStorCost( cell.DLRentStorCost() );
+ tcel.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() );
+ tcel.CoefficientValue( cell.CoefficientValue() );
+ }
+ }
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_ButtonSearch_OnClick.def
index 52aab5d..aca5917 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_ButtonSearch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_ButtonSearch_OnClick.def
@@ -9,7 +9,9 @@
{
Body:
[*
- DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ if( not isnull( DataHolderTable.Data() ) ){
+ DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_PanelExport_570_ButtonSearch_OnClick\043648.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_PanelExport_570_ButtonSearch_OnClick\043648.def"
index 2d12db4..9a01ffc 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_PanelExport_570_ButtonSearch_OnClick\043648.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Response_PanelExport_570_ButtonSearch_OnClick\043648.def"
@@ -9,7 +9,9 @@
{
Body:
[*
- DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ if( not isnull( DataHolderTable.Data() ) ){
+ DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_545_ButtonSearch_OnClick\043118.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_545_ButtonSearch_OnClick\043118.def"
index 2b48608..439f59d 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_545_ButtonSearch_OnClick\043118.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_545_ButtonSearch_OnClick\043118.def"
@@ -9,7 +9,9 @@
{
Body:
[*
- DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ if( not isnull( DataHolderTable.Data() ) ){
+ DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListFactory.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListFactory.def
new file mode 100644
index 0000000..65bf611
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListFactory.def
@@ -0,0 +1,43 @@
+Quintiq file version 2.0
+Component ListFactory
+{
+ #keys: '[415136.0.1190101823]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorFactory
+ {
+ #keys: '[415136.0.1190101824]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'Factory'
+ ]
+ }
+ #child: listActionBarPageFactory
+ Component DataSetLevelFactory
+ {
+ #keys: '[415136.0.1190101829]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuFactory
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}}]'
+ ContextMenu: 'listContextMenuFactory'
+ SortCriteria: 'ID'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ SelectionCheckboxes: true
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListGeneration.def
new file mode 100644
index 0000000..39decb4
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListGeneration.def
@@ -0,0 +1,43 @@
+Quintiq file version 2.0
+Component ListGeneration
+{
+ #keys: '[415136.0.1191359025]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorGeneration
+ {
+ #keys: '[415136.0.1191359026]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'ProductGeneration'
+ ]
+ }
+ #child: listActionBarPageGeneration
+ Component DataSetLevelGeneration
+ {
+ #keys: '[415136.0.1191359031]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuGeneration
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Generation","title":"Generation","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Generation"}}]'
+ ContextMenu: 'listContextMenuGeneration'
+ SortCriteria: 'Generation'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ SelectionCheckboxes: true
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListMQBMLB.def
new file mode 100644
index 0000000..e9a4cc8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListMQBMLB.def
@@ -0,0 +1,43 @@
+Quintiq file version 2.0
+Component ListMQBMLB
+{
+ #keys: '[415136.0.1191359783]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorMQBMLB
+ {
+ #keys: '[415136.0.1191359784]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'external[MacroPlan]'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'ProductMLBMQB'
+ ]
+ }
+ #child: listActionBarPageMQBMLB
+ Component DataSetLevelMQBMLB
+ {
+ #keys: '[415136.0.1191359789]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuMQBMLB
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MLBMQB","title":"MLBMQB","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MLBMQB"}}]'
+ ContextMenu: 'listContextMenuMQBMLB'
+ SortCriteria: 'MLBMQB'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ SelectionCheckboxes: true
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListPower.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListPower.def
new file mode 100644
index 0000000..9fa0689
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListPower.def
@@ -0,0 +1,43 @@
+Quintiq file version 2.0
+Component ListPower
+{
+ #keys: '[415136.0.1191390143]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorPower
+ {
+ #keys: '[415136.0.1191390144]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'external[MacroPlan]'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'ProductPower'
+ ]
+ }
+ #child: listActionBarPagePower
+ Component DataSetLevelPower
+ {
+ #keys: '[415136.0.1191390149]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuPower
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Power","title":"Power","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Power"}}]'
+ ContextMenu: 'listContextMenuPower'
+ SortCriteria: 'Power'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ SelectionCheckboxes: true
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_MatrixEditorTable.def
index 19c25a9..3a4ff1c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_MatrixEditorTable.def
@@ -1,19 +1,19 @@
Quintiq file version 2.0
Component MatrixEditorTable
{
- #keys: '[415136.0.864612253]'
+ #keys: '[415136.0.1191390605]'
BaseType: 'WebMatrixEditor'
Children:
[
Component MatrixEditorCellTable
{
- #keys: '[415136.0.864612254]'
+ #keys: '[415136.0.1191390606]'
BaseType: 'WebMatrixEditorCell'
Children:
[
Component DataExtractorCell
{
- #keys: '[415136.0.864612255]'
+ #keys: '[415136.0.1191390607]'
BaseType: 'WebDataExtractor'
Properties:
[
@@ -34,13 +34,13 @@
}
Component MatrixEditorRowsTable
{
- #keys: '[415136.0.864612256]'
+ #keys: '[415136.0.1191390608]'
BaseType: 'WebMatrixEditorHeaderLevel'
Children:
[
Component DataExtractorRow
{
- #keys: '[415136.0.864612257]'
+ #keys: '[415136.0.1191390609]'
BaseType: 'WebDataExtractor'
Properties:
[
@@ -60,13 +60,13 @@
}
Component MatrixEditorColumnsTable
{
- #keys: '[415136.0.864612258]'
+ #keys: '[415136.0.1191390610]'
BaseType: 'WebMatrixEditorHeaderLevel'
Children:
[
Component DataExtractorColumn
{
- #keys: '[415136.0.864612259]'
+ #keys: '[415136.0.1191390611]'
BaseType: 'WebDataExtractor'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelCategory.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelCategory.def
index f819d7b..8c80100 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelCategory.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelCategory.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelCategory
{
- #keys: '[415136.0.862221867]'
+ #keys: '[415136.0.1191390575]'
BaseType: 'WebPanel'
Children:
[
- Component RadioButtonGroupUseForPlanning id:RadioButtonGroupUseForPlanning_545
+ Component RadioButtonGroupUseForPlanning
{
- #keys: '[415136.0.862222092]'
+ #keys: '[415136.0.1191390576]'
BaseType: 'WebRadioButtonGroup'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelExport.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelExport.def
index 5654402..bd419fc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelExport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelExport.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelExport
{
- #keys: '[415136.0.862221896]'
+ #keys: '[415136.0.1191390571]'
BaseType: 'WebPanel'
Children:
[
Component ButtonSummaryExport
{
- #keys: '[415136.0.862221939]'
+ #keys: '[415136.0.1191390572]'
BaseType: 'WebButton'
Properties:
[
@@ -16,9 +16,9 @@
Taborder: 1
]
}
- Component ButtonSearch id:ButtonSearch_612
+ Component ButtonSearch
{
- #keys: '[415136.0.972100788]'
+ #keys: '[415136.0.1191390573]'
BaseType: 'WebButton'
Properties:
[
@@ -26,9 +26,9 @@
Taborder: 0
]
}
- Component bRefresh id:bRefresh_509
+ Component bRefresh
{
- #keys: '[415136.0.1153803172]'
+ #keys: '[415136.0.1191390574]'
BaseType: 'WebButton'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelFactory.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelFactory.def
new file mode 100644
index 0000000..68561ee
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelFactory.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+Component PanelFactory
+{
+ #keys: '[415136.0.1189939584]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: ListFactory
+ Component dhFactorys
+ {
+ #keys: '[415136.0.1190170634]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[Factory]*'
+ Properties:
+ [
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ Title: 'Unit'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelGeneration.def
index 27105c8..457007a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelGeneration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelGeneration.def
@@ -1,24 +1,25 @@
Quintiq file version 2.0
Component PanelGeneration
{
- #keys: '[415136.0.864612093]'
+ #keys: '[415136.0.1189909383]'
BaseType: 'WebPanel'
Children:
[
- Component ddslGeneration
+ #child: ListGeneration
+ Component dhGenerations
{
- #keys: '[415136.0.864612094]'
- BaseType: 'WebDropDownStringList'
+ #keys: '[415136.0.1190170676]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ProductGeneration]*'
Properties:
[
- Label: 'Generation'
Taborder: 0
]
}
]
Properties:
[
- Orientation: 'horizontal'
Taborder: 1
+ Title: 'Generation'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryColumnSearch.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryColumnSearch.def
index c91046e..441d5b6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryColumnSearch.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryColumnSearch.def
@@ -1,18 +1,18 @@
Quintiq file version 2.0
Component PanelInventorySummaryColumnSearch
{
- #keys: '[415136.0.864612101]'
+ #keys: '[415136.0.1191390567]'
BaseType: 'WebPanel'
Children:
[
- #child: PanelPeriod
- #child: PanelExport
#child: PanelCategory
+ #child: PanelExport
+ #child: PanelPeriod
]
Properties:
[
FixedSize: true
Orientation: 'horizontal'
- Taborder: 1
+ Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryHeader.def
deleted file mode 100644
index e149da6..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryHeader.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-Component PanelInventorySummaryHeader
-{
- #keys: '[415136.0.864612089]'
- BaseType: 'WebPanel'
- Children:
- [
- #child: PanelInventorySummaryProductSearch
- #child: PanelInventorySummaryColumnSearch
- ]
- Properties:
- [
- FixedSize: true
- Taborder: 2
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryReport.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryReport.def
new file mode 100644
index 0000000..6750498
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryReport.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelInventorySummaryReport
+{
+ #keys: '[415136.0.1189939411]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: Panelleft_847
+ #child: PanelRight
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 2
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelMQBMLB.def
index b261493..e28848c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelMQBMLB.def
@@ -1,24 +1,25 @@
Quintiq file version 2.0
Component PanelMQBMLB
{
- #keys: '[415136.0.864612095]'
+ #keys: '[415136.0.1191359549]'
BaseType: 'WebPanel'
Children:
[
- Component ddslMQBMLB
+ #child: ListMQBMLB
+ Component dhMQBMLBs
{
- #keys: '[415136.0.864612096]'
- BaseType: 'WebDropDownStringList'
+ #keys: '[415136.0.1191538373]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ProductMLBMQB]*'
Properties:
[
- Label: 'MQB/MLB'
Taborder: 0
]
}
]
Properties:
[
- Orientation: 'horizontal'
Taborder: 2
+ Title: 'MLB/MQB'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPeriod.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPeriod.def
index 188ac98..bbe732e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPeriod.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPeriod.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelPeriod
{
- #keys: '[415136.0.862221329]'
+ #keys: '[415136.0.1191390568]'
BaseType: 'WebPanel'
Children:
[
Component DateSelectorStart
{
- #keys: '[415136.0.862221355]'
+ #keys: '[415136.0.1191390569]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -17,7 +17,7 @@
}
Component DateSelectorEnd
{
- #keys: '[415136.0.862221609]'
+ #keys: '[415136.0.1191390570]'
BaseType: 'WebDateSelector'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPower.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPower.def
index f59f987..8ba1d69 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPower.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPower.def
@@ -1,24 +1,25 @@
Quintiq file version 2.0
Component PanelPower
{
- #keys: '[415136.0.864612097]'
+ #keys: '[415136.0.1191390095]'
BaseType: 'WebPanel'
Children:
[
- Component ddslPower
+ #child: ListPower
+ Component dhPowers
{
- #keys: '[415136.0.864612098]'
- BaseType: 'WebDropDownStringList'
+ #keys: '[415136.0.1191538402]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ProductPower]*'
Properties:
[
- Label: 'Power'
Taborder: 0
]
}
]
Properties:
[
- Orientation: 'horizontal'
Taborder: 3
+ Title: 'Power'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelRight.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelRight.def
new file mode 100644
index 0000000..8a28624
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelRight.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component PanelRight
+{
+ #keys: '[415136.0.1191390495]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelInventorySummaryColumnSearch
+ #child: PanelTable
+ ]
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelTable.def
index 636f0fc..ce89442 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelTable.def
@@ -1,7 +1,7 @@
Quintiq file version 2.0
Component PanelTable
{
- #keys: '[415136.0.864612252]'
+ #keys: '[415136.0.1191390604]'
BaseType: 'WebPanel'
Children:
[
@@ -9,6 +9,6 @@
]
Properties:
[
- Taborder: 3
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelUnit.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelUnit.def
deleted file mode 100644
index 4990a44..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelUnit.def
+++ /dev/null
@@ -1,24 +0,0 @@
-Quintiq file version 2.0
-Component PanelUnit
-{
- #keys: '[415136.0.864612091]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ddslUnit
- {
- #keys: '[415136.0.864612092]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- Label: 'Unit'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- Orientation: 'horizontal'
- Taborder: 0
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryProductSearch.def "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_Panelleft\043847.def"
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryProductSearch.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_Panelleft\043847.def"
index bfd68b1..b5435af 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryProductSearch.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_Panelleft\043847.def"
@@ -1,11 +1,11 @@
Quintiq file version 2.0
-Component PanelInventorySummaryProductSearch
+Component Panelleft id:Panelleft_847
{
- #keys: '[415136.0.864612090]'
+ #keys: '[415136.0.1189939498]'
BaseType: 'WebPanel'
Children:
[
- #child: PanelUnit
+ #child: PanelFactory
#child: PanelGeneration
#child: PanelMQBMLB
#child: PanelPower
@@ -13,7 +13,7 @@
Properties:
[
FixedSize: true
- Orientation: 'horizontal'
+ MinimumColumns: 20
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageFactory.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageFactory.def
new file mode 100644
index 0000000..929e143
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageFactory.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageFactory
+{
+ #keys: '[415136.0.1190101826]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageGeneration.def
new file mode 100644
index 0000000..6570d50
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageGeneration.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageGeneration
+{
+ #keys: '[415136.0.1191359028]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageMQBMLB.def
new file mode 100644
index 0000000..3eefe26
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageMQBMLB.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageMQBMLB
+{
+ #keys: '[415136.0.1191359786]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPagePower.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPagePower.def
new file mode 100644
index 0000000..09c8a60
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPagePower.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPagePower
+{
+ #keys: '[415136.0.1191390146]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuFactory.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuFactory.def
new file mode 100644
index 0000000..295209f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuFactory.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuFactory
+{
+ #keys: '[415136.0.1190101831]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuGeneration.def
new file mode 100644
index 0000000..cf1b773
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuGeneration.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuGeneration
+{
+ #keys: '[415136.0.1191359033]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuMQBMLB.def
new file mode 100644
index 0000000..7fa2f4a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuMQBMLB.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuMQBMLB
+{
+ #keys: '[415136.0.1191359791]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuPower.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuPower.def
new file mode 100644
index 0000000..c31e46a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuPower.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuPower
+{
+ #keys: '[415136.0.1191390151]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixEditorActionBarPageTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixEditorActionBarPageTable.def
index ece6871..00f1517 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixEditorActionBarPageTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixEditorActionBarPageTable.def
@@ -1,7 +1,7 @@
Quintiq file version 2.0
Component matrixEditorActionBarPageTable
{
- #keys: '[415136.0.864612260]'
+ #keys: '[415136.0.1191390612]'
BaseType: 'matrixEditorActionBarPage'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixeditorContextMenuTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixeditorContextMenuTable.def
index e7171db..cb9f904 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixeditorContextMenuTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixeditorContextMenuTable.def
@@ -1,7 +1,7 @@
Quintiq file version 2.0
Component matrixeditorContextMenuTable
{
- #keys: '[415136.0.864612261]'
+ #keys: '[415136.0.1191390613]'
BaseType: 'matrixeditorContextMenu'
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged\043618.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged\043618.def"
new file mode 100644
index 0000000..8b6c7f3
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged\043618.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ListFactory
+Response OnCheckedChanged () id:Response_ListFactory_OnCheckedChanged_618
+{
+ #keys: '[415136.0.1191538923]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := selectset( MacroPlan, Factory, factory, factory.ID() = FinancialProductionReport::GetDefaultAllUnit() );
+ dhFactorys.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged.def
new file mode 100644
index 0000000..71159e9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: ListFactory
+Response OnCheckedChanged (
+ structured[Factory] checkeditems
+) id:Response_ListFactory_OnCheckedChanged
+{
+ #keys: '[415136.0.1191538454]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := checkeditems.Copy();
+ dhFactorys.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def"
new file mode 100644
index 0000000..4571db5
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged\043568.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ListGeneration
+Response OnCheckedChanged () id:Response_ListGeneration_OnCheckedChanged_568
+{
+ #keys: '[415136.0.1190170961]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := selectset( MacroPlan, ProductGeneration, generation, true );
+ dhGenerations.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged.def
new file mode 100644
index 0000000..7155235
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: ListGeneration
+Response OnCheckedChanged (
+ structured[ProductGeneration] checkeditems
+) id:Response_ListGeneration_OnCheckedChanged
+{
+ #keys: '[415136.0.1190170872]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := checkeditems.Copy();
+ dhGenerations.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def"
new file mode 100644
index 0000000..ca3a785
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged\043393.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ListMQBMLB
+Response OnCheckedChanged () id:Response_ListMQBMLB_OnCheckedChanged_393
+{
+ #keys: '[415136.0.1190171384]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := selectset( MacroPlan, ProductMLBMQB, generation, true );
+ dhMQBMLBs.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged.def
new file mode 100644
index 0000000..d7ce115
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: ListMQBMLB
+Response OnCheckedChanged (
+ structured[ProductMLBMQB] checkeditems
+) id:Response_ListMQBMLB_OnCheckedChanged
+{
+ #keys: '[415136.0.1190171046]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := checkeditems.Copy();
+ dhMQBMLBs.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def"
new file mode 100644
index 0000000..cb08461
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged\043925.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ListPower
+Response OnCheckedChanged () id:Response_ListPower_OnCheckedChanged_925
+{
+ #keys: '[415136.0.1190171465]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := selectset( MacroPlan, ProductPower, generation, true );
+ dhPowers.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged.def
new file mode 100644
index 0000000..276e4c7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: ListPower
+Response OnCheckedChanged (
+ structured[ProductPower] checkeditems
+) id:Response_ListPower_OnCheckedChanged
+{
+ #keys: '[415136.0.1190171144]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
+ QuillAction
+ {
+ Body:
+ [*
+ selections := checkeditems.Copy();
+ dhPowers.Data( &selections );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
index 379e9a6..6ed797b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def
@@ -10,6 +10,10 @@
Body:
[*
table := InventorySummarySource::InitiateSearch( MacroPlan );
+ Factory::Initilize( MacroPlan );
+ ProductGeneration::Initilize( MacroPlan );
+ ProductPower::Initilize( MacroPlan );
+ ProductMLBMQB::Initilize( MacroPlan );
//table := selectobject( MacroPlan, InventorySummarySource.InventorySummaryReport, table, table.IsShow() );
//info( '------------------2----------------', table.IsShow() );
DataHolderTable.Data( table );
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged\043847.def" b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged.def
similarity index 71%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged\043847.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged.def
index 1ad9aaf..a79a527 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged\043847.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelCategory/RadioButtonGroupUseForPlanning_545
-Response OnChanged () id:Response_PanelPeriods_RadioButtonGroupUseForPlanning_OnChanged_847
+#parent: PanelCategory/RadioButtonGroupUseForPlanning
+Response OnChanged () id:Response_PanelCategory_RadioButtonGroupUseForPlanning_OnChanged
{
- #keys: '[415136.0.862222091]'
+ #keys: '[415136.0.1191390561]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebRadioButtonGroup_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnCreated.def
index cfe85d3..06dd546 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelCategory_RadioButtonGroupUseForPlanning_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelCategory/RadioButtonGroupUseForPlanning_545
+#parent: PanelCategory/RadioButtonGroupUseForPlanning
Response OnCreated () id:Response_PanelCategory_RadioButtonGroupUseForPlanning_OnCreated
{
- #keys: '[415136.0.875614032]'
+ #keys: '[415136.0.1191390560]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick\043290.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick\043290.def"
deleted file mode 100644
index 31ffc71..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick\043290.def"
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelExport/ButtonSearch_612
-Response OnClick () id:Response_PanelExport_ButtonSearch_OnClick_290
-{
- #keys: '[415136.0.972100787]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- QuillAction
- {
- Body:
- [*
- DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick.def
new file mode 100644
index 0000000..9b96077
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+#parent: PanelExport/ButtonSearch
+Response OnClick () id:Response_PanelExport_ButtonSearch_OnClick
+{
+ #keys: '[415136.0.1191390563]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ c := 'VWED CC';
+ info( c.Format( 'S(Len(10),AlignRight)' ), c.Format( 'S(Len(10))' ) );
+ a := 'All';
+ info( a.Format( 'S(Len(10),AlignRight)' ), a.Format( 'S(Len(10))' ) );
+ if( not isnull( DataHolderTable.Data() ) ){
+ productids := selectuniquevalues( DataHolderProduct.Data(), Elements, product, exists( dhGenerations.Data(), Elements, e, e.Generation() = product.Generation() )
+ and exists( dhMQBMLBs.Data(), Elements, e, e.MLBMQB() = product.MQBMLB() )
+ and exists( dhPowers.Data(), Elements, e, e.Power() = product.Power() ), product.ID() );
+ DataHolderTable.Data().Generate( dhSearch.Data(), dhFactorys.Data(), productids );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSummaryExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSummaryExport_OnClick.def
index dda4e49..b3d157a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSummaryExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSummaryExport_OnClick.def
@@ -2,7 +2,7 @@
#parent: PanelExport/ButtonSummaryExport
Response OnClick () id:Response_PanelExport_ButtonSummaryExport_OnClick
{
- #keys: '[415136.0.862221938]'
+ #keys: '[415136.0.1191390564]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_bRefresh_OnClick.def
index 5820e45..db9d621 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_bRefresh_OnClick.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelExport/bRefresh_509
-Response OnClick () id:Response_PanelExport_545_bRefresh_OnClick
+#parent: PanelExport/bRefresh
+Response OnClick () id:Response_PanelExport_bRefresh_OnClick
{
- #keys: '[415136.0.1153803171]'
+ #keys: '[415136.0.1191390562]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelGeneration_ddslGeneration_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelGeneration_ddslGeneration_OnCreated.def
deleted file mode 100644
index 0659423..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelGeneration_ddslGeneration_OnCreated.def
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelGeneration/ddslGeneration
-Response OnCreated () id:Response_PanelGeneration_ddslGeneration_OnCreated
-{
- #keys: '[415136.0.864612086]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Generation() );
-
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelGeneration_ddslGeneration_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelGeneration_ddslGeneration_OnSelectionChanged.def
deleted file mode 100644
index 38224e9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelGeneration_ddslGeneration_OnSelectionChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelGeneration/ddslGeneration
-Response OnSelectionChanged () id:Response_PanelGeneration_ddslGeneration_OnSelectionChanged
-{
- #keys: '[415136.0.864612085]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- //浠ｆ暟鏀瑰彉鍚庡埛鏂版樉绀�
- if( not isnull( dhSearch.Data() ) and dhSearch.Data().Generation() <> selection ){
- dhSearch.Data().Generation( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelMQBMLB_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelMQBMLB_ddslMQBMLB_OnCreated.def
deleted file mode 100644
index 31df8e8..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelMQBMLB_ddslMQBMLB_OnCreated.def
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelMQBMLB/ddslMQBMLB
-Response OnCreated () id:Response_PanelMQBMLB_ddslMQBMLB_OnCreated
-{
- #keys: '[415136.0.864612084]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.MQBMLB() );
-
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelMQBMLB_ddslMQBMLB_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelMQBMLB_ddslMQBMLB_OnSelectionChanged.def
deleted file mode 100644
index 0d5bc90..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelMQBMLB_ddslMQBMLB_OnSelectionChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelMQBMLB/ddslMQBMLB
-Response OnSelectionChanged () id:Response_PanelMQBMLB_ddslMQBMLB_OnSelectionChanged
-{
- #keys: '[415136.0.864612083]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- //妯旱鍒舵敼鍙樺悗鍒锋柊鏄剧ず
- if( not isnull( dhSearch.Data() ) and dhSearch.Data().MqbMlb() <> selection ){
- dhSearch.Data().MqbMlb( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorEnd_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
index c89a71e..a54fbc6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
@@ -2,7 +2,7 @@
#parent: PanelPeriod/DateSelectorEnd
Response OnChanged () id:Response_PanelPeriod_DateSelectorEnd_OnChanged
{
- #keys: '[415136.0.862221640]'
+ #keys: '[415136.0.1191390565]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorStart_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorStart_OnChanged.def
index 88da857..9b9f72a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorStart_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorStart_OnChanged.def
@@ -2,7 +2,7 @@
#parent: PanelPeriod/DateSelectorStart
Response OnChanged () id:Response_PanelPeriod_DateSelectorStart_OnChanged
{
- #keys: '[415136.0.862221461]'
+ #keys: '[415136.0.1191390566]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPower_ddslPower_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPower_ddslPower_OnCreated.def
deleted file mode 100644
index 24138aa..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPower_ddslPower_OnCreated.def
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelPower/ddslPower
-Response OnCreated () id:Response_PanelPower_ddslPower_OnCreated
-{
- #keys: '[415136.0.864612082]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Power() );
-
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPower_ddslPower_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPower_ddslPower_OnSelectionChanged.def
deleted file mode 100644
index d08a74b..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPower_ddslPower_OnSelectionChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelPower/ddslPower
-Response OnSelectionChanged () id:Response_PanelPower_ddslPower_OnSelectionChanged
-{
- #keys: '[415136.0.864612081]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- //鍔熺巼鏀瑰彉鍚庡埛鏂版樉绀�
- if( not isnull( dhSearch.Data() ) and dhSearch.Data().Power() <> selection ){
- dhSearch.Data().Power( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelUnit_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelUnit_ddslUnit_OnCreated.def
deleted file mode 100644
index 81f2cba..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelUnit_ddslUnit_OnCreated.def
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelUnit/ddslUnit
-Response OnCreated () id:Response_PanelUnit_ddslUnit_OnCreated
-{
- #keys: '[415136.0.864612088]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
-
- valueString := "<All>;" + InventorySummaryReport::GetDefaultCCUnit() + ";" + InventorySummaryReport::GetDefaultDLUnit();
-
- this.Strings( valueString );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelUnit_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
deleted file mode 100644
index f5eb323..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelUnit/ddslUnit
-Response OnSelectionChanged () id:Response_PanelUnit_ddslUnit_OnSelectionChanged
-{
- #keys: '[415136.0.864612087]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- //Unit鏇存柊鍚庣敓鎴愭柊鐨勬樉绀�
- if( not isnull( dhSearch.Data() ) and dhSearch.Data().Unit() <> selection ){
- dhSearch.Data().Unit( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/_ROOT_Component_FormInventorySummaryReport.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/_ROOT_Component_FormInventorySummaryReport.def
index beeeae0..d000020 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/_ROOT_Component_FormInventorySummaryReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/_ROOT_Component_FormInventorySummaryReport.def
@@ -42,8 +42,7 @@
Taborder: 1
]
}
- #child: PanelInventorySummaryHeader
- #child: PanelTable
+ #child: PanelInventorySummaryReport
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_PanelExport_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_PanelExport_ButtonSearch_OnClick.def
index 609a7d6..f85cf64 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_PanelExport_ButtonSearch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_PanelExport_ButtonSearch_OnClick.def
@@ -9,7 +9,9 @@
{
Body:
[*
- DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ if( not isnull( DataHolderTable.Data() ) ){
+ DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
+ }
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor515.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor515.def
new file mode 100644
index 0000000..fbd9bc5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor515.def
@@ -0,0 +1,99 @@
+Quintiq file version 2.0
+Component MatrixEditor515
+{
+ #keys: '[413988.0.1607432871]'
+ BaseType: 'WebMatrixEditor'
+ Children:
+ [
+ Component MatrixEditorCell568
+ {
+ #keys: '[413988.0.1607432872]'
+ BaseType: 'WebMatrixEditorCell'
+ Children:
+ [
+ Component DataExtractor802
+ {
+ #keys: '[413988.0.1607432873]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'structured[NewOfflinePlanRow]'
+ Source: 'dhSelectedDetailNewOfflinePlanRow'
+ Taborder: 0
+ Transformation: 'Elements.NewOfflinePlanCell'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Attributes: 'Quantity;Order'
+ Column: 'NewOfflinePlanColumn'
+ Row: 'NewOfflinePlanRow'
+ Taborder: 0
+ ]
+ }
+ Component MatrixEditorRows710
+ {
+ #keys: '[413988.0.1607432876]'
+ BaseType: 'WebMatrixEditorHeaderLevel'
+ Children:
+ [
+ Component DataExtractor206
+ {
+ #keys: '[413988.0.1607432877]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'structured[NewOfflinePlanRow]'
+ Source: 'dhSelectedDetailNewOfflinePlanRow'
+ Taborder: 0
+ Transformation: 'Elements'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Legend: 'Name'
+ SortCriteria: 'ProductionLine;ProductID'
+ Taborder: 1
+ ]
+ }
+ Component MatrixEditorColumns748
+ {
+ #keys: '[413988.0.1607432880]'
+ BaseType: 'WebMatrixEditorHeaderLevel'
+ Children:
+ [
+ Component DataExtractor675
+ {
+ #keys: '[413988.0.1607432881]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'NewOfflinePlanTable'
+ Source: 'dhNewOfflinePlanTable'
+ Taborder: 0
+ Transformation: 'NewOfflinePlanColumn'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Legend: 'StartDate'
+ SortCriteria: 'StartDate'
+ Taborder: 2
+ ]
+ }
+ #child: matrixEditorActionBarPage623
+ #child: matrixeditorContextMenu229
+ ]
+ Properties:
+ [
+ AllowAttributeConfiguration: true
+ AllowMultipleAttributes: true
+ Columns: 'MatrixEditorColumns748'
+ ContextMenu: 'matrixeditorContextMenu229'
+ Rows: 'MatrixEditorRows710'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor583.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor583.def
new file mode 100644
index 0000000..83cf21e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor583.def
@@ -0,0 +1,98 @@
+Quintiq file version 2.0
+Component MatrixEditor583
+{
+ #keys: '[413988.0.1607432902]'
+ BaseType: 'WebMatrixEditor'
+ Children:
+ [
+ Component MatrixEditorCell950
+ {
+ #keys: '[413988.0.1607432903]'
+ BaseType: 'WebMatrixEditorCell'
+ Children:
+ [
+ Component DataExtractor782
+ {
+ #keys: '[413988.0.1607432904]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'structured[NewOfflinePlanRow]'
+ Source: 'dhSelectedTotalNewOfflinePlanRow'
+ Taborder: 0
+ Transformation: 'Elements.NewOfflinePlanCell'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Attributes: 'TotalQuantity;ShiftPatternName;ShiftPatternStart;ShiftPatternEnd'
+ Column: 'NewOfflinePlanColumn'
+ Row: 'NewOfflinePlanRow'
+ Taborder: 0
+ ]
+ }
+ Component MatrixEditorRows569
+ {
+ #keys: '[413988.0.1607432907]'
+ BaseType: 'WebMatrixEditorHeaderLevel'
+ Children:
+ [
+ Component DataExtractor195
+ {
+ #keys: '[413988.0.1607432908]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'structured[NewOfflinePlanRow]'
+ Source: 'dhSelectedTotalNewOfflinePlanRow'
+ Taborder: 0
+ Transformation: 'Elements'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Legend: 'Name'
+ SortCriteria: 'ProductionLine;ProductID'
+ Taborder: 1
+ ]
+ }
+ Component MatrixEditorColumns473
+ {
+ #keys: '[413988.0.1607432911]'
+ BaseType: 'WebMatrixEditorHeaderLevel'
+ Children:
+ [
+ Component DataExtractor526
+ {
+ #keys: '[413988.0.1607432912]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'NewOfflinePlanTable'
+ Source: 'dhNewOfflinePlanTable'
+ Taborder: 0
+ Transformation: 'NewOfflinePlanColumn'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Legend: 'StartDate'
+ SortCriteria: 'StartDate'
+ Taborder: 2
+ ]
+ }
+ #child: matrixEditorActionBarPage338
+ #child: matrixeditorContextMenu267
+ ]
+ Properties:
+ [
+ AllowMultipleAttributes: true
+ Columns: 'MatrixEditorColumns473'
+ ContextMenu: 'matrixeditorContextMenu267'
+ Rows: 'MatrixEditorRows569'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage338.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage338.def
new file mode 100644
index 0000000..616f454
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage338.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixEditorActionBarPage338
+{
+ #keys: '[413988.0.1607432915]'
+ BaseType: 'matrixEditorActionBarPage'
+ Properties:
+ [
+ Taborder: 3
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage623.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage623.def
new file mode 100644
index 0000000..244bcae
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixEditorActionBarPage623.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixEditorActionBarPage623
+{
+ #keys: '[413988.0.1607432884]'
+ BaseType: 'matrixEditorActionBarPage'
+ Properties:
+ [
+ Taborder: 3
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def
new file mode 100644
index 0000000..0c35e50
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixeditorContextMenu229
+{
+ #keys: '[413988.0.1607432887]'
+ BaseType: 'matrixeditorContextMenu'
+ Properties:
+ [
+ Taborder: 4
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu267.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu267.def
new file mode 100644
index 0000000..c36959c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu267.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixeditorContextMenu267
+{
+ #keys: '[413988.0.1607432918]'
+ BaseType: 'matrixeditorContextMenu'
+ Properties:
+ [
+ Taborder: 4
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pDetail.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pDetail.def
new file mode 100644
index 0000000..3a2576c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pDetail.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pDetail
+{
+ #keys: '[413988.0.1607470703]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: MatrixEditor515
+ ]
+ Properties:
+ [
+ Border: true
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pHeader.def
new file mode 100644
index 0000000..90182d1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pHeader.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+Component pHeader
+{
+ #keys: '[413988.0.1607470685]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component bRefresh
+ {
+ #keys: '[413988.0.1607470932]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Refresh'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Border: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pTotal.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pTotal.def
new file mode 100644
index 0000000..b5e9aa1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_pTotal.def
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+Component pTotal
+{
+ #keys: '[413988.0.1607470720]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: MatrixEditor583
+ ]
+ Properties:
+ [
+ Taborder: 2
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_dhNewOfflinePlanTable_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_dhNewOfflinePlanTable_OnCreated.def
new file mode 100644
index 0000000..47cc3be
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_dhNewOfflinePlanTable_OnCreated.def
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#parent: dhNewOfflinePlanTable
+Response OnCreated () id:Response_FormNewOfflinePlan_dhNewOfflinePlanTable_OnCreated
+{
+ #keys: '[413988.0.1612870517]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ nopt := maxselect( MacroPlan, NewOfflinePlanTable, tempOPT, true, tempOPT.SaveDateTime() );
+
+ this.Data( nopt );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def
new file mode 100644
index 0000000..d422c3a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+#parent: pHeader/bRefresh
+Response OnClick () id:Response_pHeader_bRefresh_OnClick
+{
+ #keys: '[413988.0.1607471065]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ NewOfflinePlanCell::RefreshOfflinePlan( MacroPlan );
+
+ nopt := maxselect( MacroPlan, NewOfflinePlanTable, tempNOPT, true, tempNOPT.SaveDateTime() );
+ dhNewOfflinePlanTable.Data( nopt );
+
+ WebMessageBox::Success( Translations::A_VWED_Success() );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/_ROOT_Component_FormNewOfflinePlan.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/_ROOT_Component_FormNewOfflinePlan.def
new file mode 100644
index 0000000..2763c65
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/_ROOT_Component_FormNewOfflinePlan.def
@@ -0,0 +1,84 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormNewOfflinePlan
+{
+ #keys: '[413988.0.1606778977]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pTotal
+ #child: pHeader
+ #child: pDetail
+ Component dhNewOfflinePlanTable
+ {
+ #keys: '[413988.0.1607471150]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'NewOfflinePlanTable'
+ Properties:
+ [
+ Taborder: 3
+ ]
+ }
+ Component dhSelectedDetailNewOfflinePlanRow
+ {
+ #keys: '[413988.0.1607433222]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[NewOfflinePlanRow]*'
+ Children:
+ [
+ Component deSelectedNewOfflinePlanRow
+ {
+ #keys: '[413988.0.1608510877]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'NewOfflinePlanTable'
+ FilterArguments: 'entities:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderCheckedEntities'
+ FixedFilter: 'object.Filter( entities ) and object.Type() = "1"'
+ Source: 'dhNewOfflinePlanTable'
+ Taborder: 0
+ Transformation: 'NewOfflinePlanRow'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 4
+ ]
+ }
+ Component dhSelectedTotalNewOfflinePlanRow
+ {
+ #keys: '[413988.0.1609979741]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[NewOfflinePlanRow]*'
+ Children:
+ [
+ Component deSelectedNewOfflinePlanRow681
+ {
+ #keys: '[413988.0.1609979742]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'NewOfflinePlanTable'
+ FilterArguments: 'entities:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderCheckedEntities'
+ FixedFilter: 'object.Filter( entities ) and object.Type() = "2"'
+ Source: 'dhNewOfflinePlanTable'
+ Taborder: 0
+ Transformation: 'NewOfflinePlanRow'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 5
+ ]
+ }
+ ]
+ Properties:
+ [
+ Description: '鏂拌閰嶄笅绾胯鍒�'
+ Image: 'WIND_ENGINE_OFFSHORE'
+ Title: 'Output plan'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/HighlightRules.hl b/_Main/UI/MacroPlannerWebApp/HighlightRules.hl
new file mode 100644
index 0000000..639b01d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/HighlightRules.hl
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+HighlightRules
+{
+ HighlightRule
+ {
+ #keys: '1[413988.0.1616240421]'
+ Bidirectional: true
+ ContinueHighlighting: true
+ Description: '涓嬬嚎璁″垝鏍规嵁缁嗗垎绐佸嚭鏄剧ず鍚堣'
+ Groups: Default
+ HighlightPathString: 'Total'
+ StartTypeString: 'NewOfflinePlanCell'
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Views/NewOfflinePlan.vw b/_Main/UI/MacroPlannerWebApp/Views/NewOfflinePlan.vw
new file mode 100644
index 0000000..bcd0a9f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Views/NewOfflinePlan.vw
@@ -0,0 +1,215 @@
+Quintiq file version 2.0
+{
+ viewcontents
+ {
+ forms
+ {
+ form_FormNewOfflinePlan
+ {
+ title: 'QMacroPlanner::FormNewOfflinePlan'
+ shown: true
+ componentID: 'QMacroPlanner::FormNewOfflinePlan'
+ layout
+ {
+ mode: 'open'
+ rowPosition: 1
+ rowSpan: 14
+ columnPosition: 1
+ columnSpan: 12
+ }
+ components
+ {
+ FormNewOfflinePlan_pHeader
+ {
+ sizeRatio: 1
+ }
+ FormNewOfflinePlan_pDetail
+ {
+ sizeRatio: 1
+ }
+ FormNewOfflinePlan_MatrixEditor515
+ {
+ gridColor: '#c4c4c4'
+ totalHeaderWidth: 511
+ attributeHeaderWidthRatio: 0.6
+ nameHeaderWidthRatio: 0.4
+ columnWidth: 100
+ horizontalGrid: true
+ verticalGrid: true
+ backendState
+ {
+ componentId: 'QMacroPlanner::FormNewOfflinePlan.MatrixEditor515'
+ state
+ {
+ cells
+ {
+ attributes
+ {
+ attribute_Quantity
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 0
+ rowsubtotal: ''
+ columnsubtotal: 'sum'
+ attribute: 'Quantity'
+ }
+ attribute_Order
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 1
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'Order'
+ }
+ }
+ }
+ columns
+ {
+ sorting
+ {
+ criteria: "datamember:'StartDate'"
+ }
+ }
+ rows
+ {
+ sorting
+ {
+ criteria: "datamember:'ProductionLine';datamember:'ProductID'"
+ }
+ }
+ }
+ }
+ }
+ FormNewOfflinePlan_pTotal
+ {
+ sizeRatio: 1
+ }
+ FormNewOfflinePlan_MatrixEditor583
+ {
+ gridColor: '#c4c4c4'
+ totalHeaderWidth: 510
+ attributeHeaderWidthRatio: 0.6
+ nameHeaderWidthRatio: 0.4
+ columnWidth: 100
+ horizontalGrid: true
+ verticalGrid: true
+ backendState
+ {
+ componentId: 'QMacroPlanner::FormNewOfflinePlan.MatrixEditor583'
+ state
+ {
+ cells
+ {
+ attributes
+ {
+ attribute_TotalQuantity
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 0
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'TotalQuantity'
+ }
+ attribute_ShiftPatternName
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 1
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'ShiftPatternName'
+ }
+ attribute_ShiftPatternStart
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 2
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'ShiftPatternStart'
+ }
+ attribute_ShiftPatternEnd
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 3
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'ShiftPatternEnd'
+ }
+ }
+ }
+ columns
+ {
+ sorting
+ {
+ criteria: "datamember:'StartDate'"
+ }
+ }
+ rows
+ {
+ sorting
+ {
+ criteria: "datamember:'ProductionLine';datamember:'ProductID'"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ form_FormGeneralSettings
+ {
+ title: 'General Settings'
+ shown: true
+ componentID: 'FormGeneralSettings'
+ layout
+ {
+ mode: 'dockright'
+ index: 0
+ }
+ components
+ {
+ FormGeneralSettings_PanelContent
+ {
+ sizeRatio: 1
+ }
+ FormGeneralSettings_PanelGeneralParameter
+ {
+ sizeRatio: 1
+ }
+ FormGeneralSettings_PanelLeadTimeDependent
+ {
+ sizeRatio: 1
+ }
+ FormGeneralSettings_PanelShelfLife
+ {
+ sizeRatio: 1
+ }
+ FormGeneralSettings_PanelSustainability
+ {
+ sizeRatio: 1
+ }
+ FormGeneralSettings_PanelForecastNetting
+ {
+ sizeRatio: 1
+ }
+ FormGeneralSettings_PanelActions
+ {
+ sizeRatio: 1
+ }
+ }
+ }
+ }
+ userconfigurableinformation
+ {
+ }
+ page: ''
+ group: ''
+ index: 0
+ image: 'CHART_DONUT'
+ description: ''
+ }
+ formatversion: 2
+ id: 'NewOfflinePlan'
+ name: 'NewOfflinePlan'
+ isglobal: false
+ isroot: true
+}
--
Gitblit v1.9.3