From d03861b11b193439353fa5d9b92eb6ee1e6458e2 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期六, 12 十月 2024 17:33:03 +0800
Subject: [PATCH] 库存汇总报表查询条件格式修改，发动机物流成本报表系数，汇总添加
---
_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/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixEditorActionBarPageTable.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_545_ButtonSearch_OnClick#118.def | 4
_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_CCEngineLogisticsCostRow/Method_Initialize.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPagePower.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuMQBMLB.def | 10
_Main/BL/Type_FinancialProductionCell/Attribute_IsUpdate.qbl | 8
_Main/BL/Relations/Relation_ProductPower_MacroPlan_MacroPlan_ProductPower.qbl | 23
_Main/BL/Type_FinancialProductionSource/Method_AfterImport.qbl | 67 +
_Main/BL/Type_CCEngineLogisticsCostCell/Attribute_CoefficientValue.qbl | 8
_Main/BL/Type_ProductGeneration/Attribute_Generation.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListFactory.def | 43 +
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_matrixeditorContextMenuTable.def | 2
_Main/BL/Type_Factory/Attribute_Name.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListGeneration_OnCheckedChanged#568.def | 17
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/_ROOT_Component_FormInventorySummaryReport.def | 3
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuGeneration.def | 10
_Main/Sys/Repr/Global/CCEngineLogisticsCostCell.qrp | 4
_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/StaticMethod_CraeteCellValueForRow.qbl | 21
_Main/BL/Type_EnginePipelineRow/Attribute_Demand.qbl | 7
_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_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl | 255 ++------
_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/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_ButtonSearch_OnClick.def | 4
_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl | 13
_Main/BL/Type_ProductGeneration/StaticMethod_Initilize.qbl | 16
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged.def | 19
_Main/Sys/Repr/Global/ProductInStockingPointInPeriod.qrp | 1
_Main/BL/Type_EnginePipelineRow/DefaultValue_Product.qbl | 6
_Main/BL/Type_EnginePipelineRow/Attribute_Product.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelInventorySummaryColumnSearch.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelCategory.def | 6
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 23
_Main/BL/Type_CCEngineLogisticsCostCell/Function_CalcAllCost.qbl | 2
_Main/BL/Type_ProductPower/Attribute_Power.qbl | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelPower.def | 13
_Main/BL/Type_InventorySummarySource/StaticMethod_InitiateSearch.qbl | 5
_Main/BL/Type_ProductMLBMQB/_ROOT_Type_ProductMLBMQB.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuPower.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged#925.def | 17
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListMQBMLB_OnCheckedChanged.def | 19
_Main/BL/Type_Factory/Attribute_ID.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_bRefresh_OnClick.def | 6
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Download.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_PanelExport_670_ButtonSearch_OnClick.def | 4
_Main/BL/Type_ProductGeneration/_ROOT_Type_ProductGeneration.qbl | 10
_Main/Sys/Repr/Global/DLEngineLogisticsCostCell.qrp | 4
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_Panelleft#847.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelGeneration.def | 13
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listContextMenuFactory.def | 10
_Main/BL/Type_CCEngineLogisticsCostCell0/Attribute_CoefficientValue.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageGeneration.def | 10
_Main/BL/Type_FinancialWeeklyReport/StaticMethod_Initialize.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListPower_OnCheckedChanged.def | 19
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelRight.def | 15
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_MatrixEditorTable_OnUpdateValue.def | 32
_Main/BL/Relations/Relation_Factory_MacroPlan_MacroPlan_Factory.qbl | 23
_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def | 8
_Main/BL/Type_InventorySummaryReport/Method_GenerateShow#925.qbl | 42 +
_Main/BL/Type_InventorySummaryReport/Method_Generate.qbl | 45 -
_Main/BL/Type_Factory/StaticMethod_Initilize.qbl | 15
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Component_MatrixEditorTable.def | 2
_Main/BL/Type_ProductMLBMQB/Attribute_MLBMQB.qbl | 7
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Import.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListGeneration.def | 43 +
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_ListMQBMLB.def | 43 +
_Main/BL/Type_ProductMLBMQB/StaticMethod_Initilize.qbl | 16
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_ListFactory_OnCheckedChanged#618.def | 17
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorStart_OnChanged.def | 2
_Main/BL/Type_CCEngineLogisticsCostRow0/Method_Initialize.qbl | 20
_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl | 38 +
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelMQBMLB.def | 13
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelPeriod_DateSelectorEnd_OnChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelTable.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_OnCreated.def | 4
_Main/BL/Type_EnginePipelineReport/Method_Generate.qbl | 39
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageMQBMLB.def | 10
_Main/BL/Relations/Relation_ProductGeneration_MacroPlan_MacroPlan_ProductGeneration.qbl | 23
_Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl | 19
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_listActionBarPageFactory.def | 10
_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_FormInventorySummaryReport/Component_ListPower.def | 43 +
_Main/BL/Type_ProductPower/StaticMethod_Initilize.qbl | 16
_Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Response_PanelExport_ButtonSearch_OnClick.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Response_PanelExport_ButtonSearch_OnClick.def | 25
_Main/BL/Type_ProductPower/_ROOT_Type_ProductPower.qbl | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventorySummaryReport/Component_PanelFactory.def | 25
101 files changed, 1,169 insertions(+), 442 deletions(-)
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_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_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_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_InitializeNew.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
index cff8bf9..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,15 +27,8 @@
//澶栫搴撲粨鍌ㄨ垂鐢細浠撳偍鏁伴噺/鍖呰瀹归噺*浠撳偍鍗曚环锛屽湪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 := not isdltoccrent and stockingpoint.ID().StartsWith( '澶ц繛' ) or stockingpoint.ID().StartsWith( 'DL' );
- // info( '--------------', isccrent, isdltoccrent, isdlrent );
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 ) ) ){
@@ -51,9 +38,7 @@
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 trans.Origin() = '澶ц繛鍘傚唴搴�'
- and trans.Destination() = '澶ц繛澶栫搴�'
- and exists( productparents, Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+ 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
@@ -67,30 +52,34 @@
//鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= pispip.Start().Date() and engine.EndDate() >= pispip.Start().Date()
and engine.Factory() = ccfactory );
- 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 );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
+ 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( pispip.PlannedInventoryLevelEnd() / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.DLRentStorCost( cell.DLRentStorCost() + cost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
- // info( '**********************', pispip.NewSupplyQuantity() );
- row.SetDLRentEnterCost( column, enginecost, pispip.NewSupplyQuantity() );//澶ц繛澶栫搴撳叆搴撹垂鐢�
- transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= pispip.Start().Date() and trans.EndDate() >= pispip.Start().Date() );
- if( not isnull( transcost ) ){
- cost := ceil( ceil( pispip.NewSupplyQuantity() / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- row.SetFactoryToRentTransCost( column, 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 );
+ }
+ }
}
}
}
@@ -98,123 +87,37 @@
}
}
}
- //鍦� 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( '澶ц繛澶栫搴�' );
- // if( isdlspline and isdlrent ){
- // traverse( table, Column, column ){
- // alltrips := selectset( laneleg, Trip, trip, trip.Arrival().Date() < column.StartDate().StartOfNextMonth() and trip.Arrival().Date() >= column.StartDate() );
- //// info( '--------------------', alltrips.Size(), 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 ){
- // producttrips := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ), pit.ProductID() );
- //// info( '--------------2---------------', producttrips.Size() );
- // 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() = 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() ) ) );
- //// info( '-------------------', not isnull( enginecost ) and not isnull( transcost ), isnull( transcost ), product.ID() );
- // if( not isnull( enginecost ) and not isnull( transcost ) ){
- //// info( '-------------------', product.ID(), transcost.LoadingCapacity() );
- // cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- // info( quantity, ceil( quantity / enginecost.PackagingCapacity() ), ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) );
- // row.SetFactoryToRentTransCost( column, cost );
- // }
- // }
- // }
- // }
- //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 );
- // }
- // }
- // }
- // }
- // }
- //}
//闀挎槬闀块�旇繍杈撹垂鐢細璋冩嫧鏁伴噺/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环锛岃皟鎷ㄨ鍒掗噷鎵惧埌璇ヤ骇鍝佷粠DL鍒癈C鐨勮皟鎷ㄦ暟閲忥紝鍗宠捣濮嬪湴澶ц繛瑁呴厤绾胯竟搴擄紝鐩殑鍦颁负闀挎槬澶栫搴撳搴旂殑杩愯緭鏁伴噺锛屽湪鍙戝姩鏈烘垚鏈弬鏁拌〃鎵惧埌瀵瑰簲鐨勫寘瑁呭閲忥紝鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲忥紝鐢ㄥ叕寮忚绠楀緱鍑虹粨鏋滐紝鏈堝害杩涜姹囨��
traverse( owner, Unit.Lane.LaneLeg, laneleg ){
- // isdlspline := laneleg.OriginStockingPointID().EndsWith( '鍘傚唴搴�' ) and ( laneleg.OriginStockingPointID().StartsWith( '澶ц繛' ) or laneleg.OriginStockingPointID().StartsWith( 'DL' ) );
- // //鐩殑鍦版槸鍚︽槸澶ц繛澶栫搴�
- // isdlrent := laneleg.DestinationStockingPointID().EndsWith( '澶ц繛澶栫搴�' );
//璧峰搴撳瓨鐐规槸鍚︽槸澶ц繛(澶ц繛鍘傚唴搴擄級
- isdl := laneleg.OriginStockingPointID().EndsWith( '鍘傚唴搴�' ) and ( laneleg.OriginStockingPointID().StartsWith( '澶ц繛' ) or laneleg.OriginStockingPointID().StartsWith( 'DL' ) );
+ isdl := laneleg.OriginStockingPointID().EndsWith( '鍘傚唴搴�' ) and ( laneleg.OriginStockingPointID().StartsWith( '澶ц繛' ) or laneleg.OriginStockingPointID().StartsWith( 'DL' ) );
//鐩殑鍦板簱瀛樼偣鏄惁鏄暱鏄ワ紙闀挎槬澶栫搴擄級
- iscc := laneleg.DestinationStockingPointID() = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
+ iscc := laneleg.DestinationStockingPointID() = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
if( isdl and iscc ){
- // if( isdlspline and isdlrent ){
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() );
- // info( '--------------------', alltrips.Size(), 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() );
+ 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 ){
producttrips := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ), pit.ProductID() );
- // info( '--------------2---------------', producttrips.Size() );
traverse( producttrips, Elements, producttrip ){//, producttrip = '6912'
- row := table.GetRow( 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()
+ 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()
+ 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() ) ) );
- // info( '-------------------', not isnull( enginecost ) and not isnull( transcost ), isnull( transcost ), product.ID() );
+
if( not isnull( enginecost ) and not isnull( transcost ) ){
- // info( '-------------------', product.ID(), transcost.LoadingCapacity() );
- cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- // info( quantity, ceil( quantity / enginecost.PackagingCapacity() ), ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) );
- // row.SetFactoryToRentTransCost( column, cost );
- cell := selectobject( row, Cell, cell, cell.Column() = column );
+ cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
+ cell := selectobject( row, Cell, cell, cell.Column() = column );
cell.CCLongTransCost( cell.CCLongTransCost() + cost )
}
}
@@ -259,62 +162,60 @@
}
}
//闀挎槬鐭�旇繍杈撹垂鐢細瀹㈡埛闇�姹傛暟閲�/鍖呰瀹归噺/瑁呰浇瀹归噺*杩愯緭鍗曚环锛屽鎴烽渶姹傛暟閲忓彇鑷猣orecast閲宻ales segment涓洪暱鏄ョ殑鏁伴噺姹囨�伙紝鍐嶇敤鍏紡璁＄畻锛屾湀搴﹁繘琛屾眹鎬伙紙鍙栧鎴烽渶姹傛暟閲忔崲绠楁垚杞︽锛�
- 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' )
+ 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' )
+ //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 );
- }
- }
- }
- }
- //info( '***********1********', dlforecasts.Size() );
+ 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 )
+ 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() = 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() );
+ 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() );
+ quantity := sum( allpsdips, Elements, psdip, psdip.Quantity() );
- cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
- // info( '******************', quantity, cost );
- // cell := selectobject( row, Cell, cell, cell.Column() = column );
- row.SetDLRentOutCost( column, cost );
- }
+ 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_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_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_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_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/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_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
}
--
Gitblit v1.9.3