From 1416622ccad797dc3602b6672ca59137bab49c7e Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 31 十月 2024 17:12:30 +0800
Subject: [PATCH] 机加管线报表库存值逻辑修改
---
_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCArrivalQty.qbl | 8 +
_Main/BL/Type_EnginePipelineReport/Method_Generate0.qbl | 68 +++------
_Main/BL/Type_MachiningPipelineReport/Method_Generate.qbl | 69 +++++++--
_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl | 8
_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl | 18 +-
_Main/BL/Type_MachiningPipelineRow/Method_SetDepartureAndArrivalValue.qbl | 24 +++
_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCDepartureQty.qbl | 8 +
_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLDepartureQty.qbl | 8 +
_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLArrivalQty.qbl | 8 +
_Main/BL/Type_MachiningPipelineRow/Attribute_DLInventoryQty.qbl | 8 +
_Main/BL/Type_MachiningPipelineRow/Attribute_CCInventoryQty.qbl | 8 +
_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl | 86 ++++++-----
_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl | 83 +++++++----
13 files changed, 257 insertions(+), 147 deletions(-)
diff --git a/_Main/BL/Type_EnginePipelineReport/Method_Generate0.qbl b/_Main/BL/Type_EnginePipelineReport/Method_Generate0.qbl
index 733701c..61f7d47 100644
--- a/_Main/BL/Type_EnginePipelineReport/Method_Generate0.qbl
+++ b/_Main/BL/Type_EnginePipelineReport/Method_Generate0.qbl
@@ -43,7 +43,7 @@
showrowccproduction := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '闀挎槬浜ч噺' ), row.Name(), '', showrowdlproduction.RowNr() + 1 );
showrowdemand := EnginePipelineRow::CraeteCellValueForRow( this, rowname.Concat( '鎬婚渶姹�' ), row.Name(), '', showrowccproduction.RowNr() + 1 );
rownr := showrowdemand.RowNr() + 1;
- modelsnr := showrowdemand.RowNr() + 3;
+ modelsnr := showrowdemand.RowNr() + 4;
uniquemodels := selectuniquevalues( row, Cell.Demand, demand, true, demand.Model() );
demandrows := construct( EnginePipelineRows );
traverse( uniquemodels, Elements, e ){
@@ -67,87 +67,63 @@
//鐢熶骇
productionqty := sum( daycells, Elements, cell, cell.ProductionQuantity() );
- production := column.CellValue( relnew, Value := [String]productionqty );
- showrowproduction.CellValue( relinsert, production );
+ production := selectobject( column, CellValue, c, c.Row() = showrowproduction );
+ production.Value( [String]productionqty );
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() + productionqty ) );
//澶ц繛浜ч噺
- dlproductionqty := sum( daycells, Elements, cell, cell.Production().DLProduction() );
- dlproduction := column.CellValue( relnew, Value := [String]dlproductionqty );
- showrowdlproduction.CellValue( relinsert, dlproduction );
+ dlproductionqty := sum( daycells, Elements.Production, cellproduction, cellproduction.DLProduction() );
+ dlproduction := selectobject( column, CellValue, c, c.Row() = showrowdlproduction );
+ dlproduction.Value( [String]dlproductionqty );
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() + dlproductionqty ) );
//闀挎槬浜ч噺
- ccproductionqty := sum( daycells, Elements, cell, cell.Production().CCProduction() );
- ccproduction := column.CellValue( relnew, Value := [String]ccproductionqty );
- showrowccproduction.CellValue( relinsert, ccproduction );
+ ccproductionqty := sum( daycells, Elements.Production, cellproduction, cellproduction.CCProduction() );
+ ccproduction := selectobject( column, CellValue, c, c.Row() = showrowccproduction );
+ ccproduction.Value( [String]ccproductionqty );
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() + ccproductionqty ) );
//闇�姹�
totaldemandqty := sum( daycells, Elements, cell, cell.DemandQuantity() );
- totaldemand := column.CellValue( relnew, Value := [String]totaldemandqty );
- showrowdemand.CellValue( relinsert, totaldemand );
+ totaldemand := selectobject( column, CellValue, c, c.Row() = showrowdemand );
+ totaldemand.Value( [String]totaldemandqty );
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() + totaldemandqty ) );
//鍏蜂綋闇�姹�
traverse( demandrows, Elements, demandrow ){
demandqty := sum( daycells, Elements.Demand, celldemand, celldemand.Model() = demandrow.Demand(), celldemand.Quantity() );
- demandcell := column.CellValue( relnew, Value := [String]demandqty );
- demandrow.CellValue( relinsert, demandcell );
+ demandcell := selectobject( column, CellValue, c, c.Row() = demandrow );
+ demandcell.Value( [String]demandqty );
sumdemandrow := selectobject( sumdemandrows, Elements, r, r.Demand() = demandrow.Demand() );
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() + demandqty ) );
}
}
//搴撳瓨
- inventroyqty := maxobject( daycells, Elements, e, e.Column().StartDate() ).InventoryQuantity();
- inventory := column.CellValue( relnew, Value := [String]inventroyqty );
- 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 );
- }
+ inventroyqty := maxobject( daycells, Elements, e, e.Column().StartDate() ).InventoryQuantity();
+ inventory := selectobject( column, CellValue, c, c.Row() = showrowinventory );
+ inventory.Value( [String]inventroyqty );
+ suminventory := selectobject( column, CellValue, c, c.Row() = sumrowinventory );
suminventory.Value( [String]( [Real]suminventory.Value() + inventroyqty ) );
}
}
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() = sumname );
+ 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 := '' );
+ demandcell := column.CellValue( relnew, Value := '' );
demandrow.CellValue( relinsert, demandcell );
}
}
}
- rows := selectsortedset( this, Row, row, row.Name(), row.RowNr() );
- i := 0;
+ rows := selectsortedset( this, Row, row, row.Name(), row.RowNr() );
+ i := 0;
traverse( rows, Elements, e ){
e.RowNr( i );
- i := i + 1;
+ i := i + 1;
}
*]
}
diff --git a/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl b/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl
index 7eac237..2d828d6 100644
--- a/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl
+++ b/_Main/BL/Type_EnginePipelineRow/StaticMethod_CraeteCellValueForRow.qbl
@@ -12,10 +12,10 @@
[*
// 鐢勫叞楦� Jul-11-2024 (created)
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 );
- //}
+ traverse( table, Column, column ){
+ cell := column.CellValue( relnew, Value := '0' );
+ row.CellValue( relinsert, cell );
+ }
return row;
*]
}
diff --git a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
index dbb23a4..784080d 100644
--- a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
@@ -17,46 +17,52 @@
products := construct( Product_MPs );
//鍒濆鍖栧垪
- table.GenerateColumn( owner, 'All', search.StartDate(), search.EndDate() );
+ table.GenerateColumn( owner, Translations::MP_GlobalParameters_Day(), search.StartDate(), search.EndDate() );
endperiod := maxobject( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day(), period.StartDate() );
//鐢熸垚鐢熶骇鍜屽簱瀛樻暟鎹�
traverse( owner, StockingPoint_MP, stockingpoint ){
+ unit := stockingpoint.Unit();
+ parentunits := unit.GetAllParent();
//鏄惁灞炰簬闀挎槬宸ュ巶
- iscc := ( stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '闀挎槬' ) ) and stockingpoint.ID().EndsWith( '鍘傚唴搴�' );
+ iscc := stockingpoint.ID().StartsWith( 'CC' ) or unit.ID().StartsWith( 'CC' ) or exists( parentunits, Elements, punit, punit.ID().StartsWith( 'CC' ) );
//鏄惁灞炰簬澶ц繛宸ュ巶
- isdl := ( ( stockingpoint.ID().StartsWith( 'DL' ) or stockingpoint.ID().StartsWith( '澶ц繛' ) ) and stockingpoint.ID().EndsWith( '鍘傚唴搴�' ) ) or stockingpoint.ID() = '澶ц繛澶栫搴�';
-
- traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and not pisp.IsSystem()
- and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent )
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) ) ){
- pispips := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical()
- and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day(), pispip.Start() );
- row := table.GetRow( pisp.ProductID() );
- products.Add( pisp.Product_MP() );
- traverse( pispips, Elements, pispip ){
- //澶�
- daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), pispip.Start().Date() );
- //鍛�
- weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), pispip.Start().Date() );
- supplyquantity := [Number]pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
- inventoryquantity := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
- //浜ч噺鏄姞鎬�
- if( iscc or isdl ){
- row.SetCellProductionValue( daycolumn, iscc, [Real]supplyquantity );
- row.SetCellProductionValue( weekcolumn, iscc, [Real]supplyquantity );
+ isdl := stockingpoint.ID().StartsWith( 'DL' ) or unit.ID().StartsWith( 'DL' ) or exists( parentunits, Elements, punit, punit.ID().StartsWith( 'DL' ) );
+ //鏄惁灞炰簬闀挎槬浜ч噺
+ isccproduction := iscc and stockingpoint.ID().EndsWith( '鍘傚唴搴�' );
+ //鏄惁灞炰簬澶ц繛浜ч噺
+ isdlproduction := isdl and stockingpoint.ID().EndsWith( '鍘傚唴搴�' ) or stockingpoint.ID() = '澶ц繛澶栫搴�';
+ if( isccproduction or isdlproduction ){
+ traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and not pisp.IsSystem()
+ and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent )
+ and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) ) ){
+ pispips := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical()
+ and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ), pispip.Start() );
+ row := table.GetRow( pisp.ProductID() );
+ products.Add( pisp.Product_MP() );
+ traverse( pispips, Elements, pispip ){
+ //澶�
+ daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), pispip.Start().Date() );
+ //鍛�
+ // weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), pispip.Start().Date() );
+ supplyquantity := pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
+ inventoryquantity := pispip.PlannedInventoryLevelEnd();
+ //浜ч噺鏄姞鎬�
+ if( isccproduction or isdlproduction ){
+ row.SetCellProductionValue( daycolumn, iscc, supplyquantity );
+ // row.SetCellProductionValue( weekcolumn, iscc, supplyquantity );
+ }
+ //搴撳瓨闇�瑕佸彇鏈�鍚庝竴澶�
+ row.SetCellInventoryValue( daycolumn, [Real]inventoryquantity );
+
+ // if( pispip.Start().Date() = weekcolumn.EndDate() or pispip.Period_MP() = endperiod ){
+ //
+ // row.SetCellInventoryValue( weekcolumn, [Real]inventoryquantity );
+ // }
}
- //搴撳瓨闇�瑕佸彇鏈�鍚庝竴澶�
- row.SetCellInventoryValue( daycolumn, [Real]inventoryquantity );
-
- if( pispip.Start().Date() = weekcolumn.EndDate() or pispip.Period_MP() = endperiod ){
-
- row.SetCellInventoryValue( weekcolumn, [Real]inventoryquantity );
- }
}
}
}
-
//鐢熸垚闇�姹傛暟鎹�
traverse( owner, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.SalesSegment_MP() ) and forecast.StartDate() < endperiod.StartDate() and forecast.Quantity() <> 0
and exists( forecast.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent )
@@ -68,26 +74,26 @@
//澶�
daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), psdip.StartDate() );
//鍛�
- weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), psdip.StartDate() );
+ // weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), psdip.StartDate() );
if( not isnull( daycolumn ) ){
row.SetCellDemandValue( daycolumn, forecast.SalesSegmentName(), forecast.Quantity() );
}
- if( not isnull( weekcolumn ) ){
- row.SetCellDemandValue( weekcolumn, forecast.SalesSegmentName(), forecast.Quantity() );
- }
+ // if( not isnull( weekcolumn ) ){
+ // row.SetCellDemandValue( weekcolumn, forecast.SalesSegmentName(), forecast.Quantity() );
+ // }
// if( psdip.StartDate() = ( weekstart + Duration::Days( 6 ) ).Date() or psdip.PeriodStart() = endperiod.StartDate() ){
// weekstart := ( weekstart + Duration::Days( 7 ) ).Date();
// }
}
}
- rows := selectsortedset( table, Row, row, row.Name() );
- i := 0;
- traverse( rows, Elements, e ){
- e.RowNr( i );
- i := i + 1;
- }
+ //rows := selectsortedset( table, Row, row, row.Name() );
+ //i := 0;
+ //traverse( rows, Elements, e ){
+ // e.RowNr( i );
+ // i := i + 1;
+ //}
showtable.Generate( search, products );
*]
}
diff --git a/_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLArrivalQty.qbl b/_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLArrivalQty.qbl
new file mode 100644
index 0000000..0e905ac
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLArrivalQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCToDLArrivalQty
+{
+ #keys: '3[415136.0.1262801280][415136.0.1262801279][415136.0.1262801281]'
+ Description: 'CC to DL 鍒拌揪鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLDepartureQty.qbl b/_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLDepartureQty.qbl
new file mode 100644
index 0000000..f86688c
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineCell/Attribute_CCToDLDepartureQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCToDLDepartureQty
+{
+ #keys: '3[415136.0.1262801270][415136.0.1262801269][415136.0.1262801271]'
+ Description: 'CC to DL绂诲満鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCArrivalQty.qbl b/_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCArrivalQty.qbl
new file mode 100644
index 0000000..5891e93
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCArrivalQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DLToCCArrivalQty
+{
+ #keys: '3[415136.0.1262801300][415136.0.1262801299][415136.0.1262801301]'
+ Description: 'DL to CC 鍒拌揪鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCDepartureQty.qbl b/_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCDepartureQty.qbl
new file mode 100644
index 0000000..7a6ceee
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineCell/Attribute_DLToCCDepartureQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DLToCCDepartureQty
+{
+ #keys: '3[415136.0.1262801290][415136.0.1262801289][415136.0.1262801291]'
+ Description: 'DL to CC绂诲満鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachiningPipelineReport/Method_Generate.qbl b/_Main/BL/Type_MachiningPipelineReport/Method_Generate.qbl
index ceb56aa..9822d5e 100644
--- a/_Main/BL/Type_MachiningPipelineReport/Method_Generate.qbl
+++ b/_Main/BL/Type_MachiningPipelineReport/Method_Generate.qbl
@@ -8,31 +8,60 @@
TextBody:
[*
// 鐢勫叞楦� Jun-25-2024 (created)
- table := selectobject( this, Source.Report, report, not report.IsShow() );
+ startyearmonth := search.MacroPlan().StartOfPlanning().StartOfMonth().Date();
+ table := selectobject( this, Source.Report, report, not report.IsShow() );
//娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
this.Clear( search.TimeUnit(), search.StartDate(), search.EndDate() );
//杩囨护鍚庣殑浜у搧id
- productids := selectuniquevalues( products, Elements, product, true, product.ID() );
- sumrow := this.Row( relnew, Name := 'SUM', RowNr := table.Row( relsize ) );
+ productids := selectuniquevalues( products, Elements, product, true, product.ID() );
+ sumrow := this.Row( relnew, Name := 'SUM', RowNr := table.Row( relsize ) );
traverse( table, Row, row, productids.Find( row.Name() ) >= 0 ){
- showrow := this.Row( relnew, Name := row.Name(), RowNr := row.RowNr() );
-
- traverse( row, Cell, cell, cell.Column().TimeUnit() = search.TimeUnit() ){
- column := selectobject( this, Column, column, column.StartDate() = cell.Column().StartDate() and column.TimeUnit() = search.TimeUnit() );
-
- if( not isnull( column ) ){
- sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
- if( isnull( sumcell ) ){
- sumcell := MachiningPipelineCell::Initialize( column );
- sumrow.Cell( relinsert, sumcell );
- }
-
- showcell := cell.Copy( column );
- showrow.Cell( relinsert, showcell );
-
- sumcell.Add( cell );
-
+ showrow := this.Row( relnew, Name := row.Name(), RowNr := row.RowNr() );
+ traverse( this, Column, column ){
+ daycells := selectset( row, Cell, cell, cell.Column().TimeUnit() = Translations::MP_GlobalParameters_Day() and
+ cell.Column().StartDate() >= column.StartDate() and
+ cell.Column().StartDate() <= column.EndDate() );
+ maxinventory := maxobject( daycells, Elements, e, e.Column().StartDate() );
+ ccassemblyplanqty := sum( daycells, Elements, cell, cell.CCAssemblyPlanQty() );
+ ccproductionqty := sum( daycells, Elements, cell, cell.CCProductionQty() );
+ cctransferqty := sum( daycells, Elements, cell, cell.CCTransferQty() );
+ ccinventoryqty := 0.0;
+ dlassemblyplanqty := sum( daycells, Elements, cell, cell.DLAssemblyPlanQty() );
+ dlproductionqty := sum( daycells, Elements, cell, cell.DLProductionQty() );
+ dltransferqty := sum( daycells, Elements, cell, cell.DLTransferQty() );
+ dlinventoryqty := 0.0;
+ if( column.StartDate() = startyearmonth ){//褰撴棩鏈熸槸璁″垝寮�濮嬬涓�涓湀鏃讹紝璁＄畻搴撳瓨鏄疄闄呭簱瀛�
+ ccinventoryqty := row.CCInventoryQty() + maxinventory.CCProductionQty() - maxinventory.CCToDLDepartureQty() + maxinventory.DLToCCArrivalQty() - maxinventory.CCAssemblyPlanQty();
+ dlinventoryqty := row.DLInventoryQty() + maxinventory.DLProductionQty() - maxinventory.DLToCCDepartureQty() + maxinventory.CCToDLArrivalQty() - maxinventory.DLAssemblyPlanQty();
+ }else{
+ beforecolumn := column.PreviousColumn();
+ beforeinventory := selectobject( showrow, Cell, c, c.Column() = beforecolumn );
+ ccinventoryqty := beforeinventory.CCInventoryQty() + maxinventory.CCProductionQty() - maxinventory.CCToDLDepartureQty() + maxinventory.DLToCCArrivalQty() - maxinventory.CCAssemblyPlanQty();
+ ccinventoryqty := beforeinventory.DLInventoryQty() + maxinventory.DLProductionQty() - maxinventory.DLToCCDepartureQty() + maxinventory.DLToCCDepartureQty() - maxinventory.DLAssemblyPlanQty();
}
+ sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
+ if( isnull( sumcell ) ){
+ sumcell := column.Cell( relnew, CCAssemblyPlanQty := 0,
+ CCProductionQty := 0,
+ CCTransferQty := 0,
+ CCInventoryQty := 0,
+ DLAssemblyPlanQty := 0,
+ DLProductionQty := 0,
+ DLTransferQty := 0,
+ DLInventoryQty := 0 );
+ sumrow.Cell( relinsert, sumcell );
+ }
+ showcell := column.Cell( relnew, CCAssemblyPlanQty := ccassemblyplanqty,
+ CCProductionQty := ccproductionqty,
+ CCTransferQty := cctransferqty,
+ CCInventoryQty := ccinventoryqty,
+ DLAssemblyPlanQty := dlassemblyplanqty,
+ DLProductionQty := dlproductionqty,
+ DLTransferQty := dltransferqty,
+ DLInventoryQty := dlinventoryqty );
+ showrow.Cell( relinsert, showcell );
+
+ sumcell.Add( showcell );
}
}
*]
diff --git a/_Main/BL/Type_MachiningPipelineRow/Attribute_CCInventoryQty.qbl b/_Main/BL/Type_MachiningPipelineRow/Attribute_CCInventoryQty.qbl
new file mode 100644
index 0000000..d5a8ccd
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineRow/Attribute_CCInventoryQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute CCInventoryQty
+{
+ #keys: '3[415136.0.1262801322][415136.0.1262801321][415136.0.1262801323]'
+ Description: 'CC瀹為檯搴撳瓨鏁版嵁'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachiningPipelineRow/Attribute_DLInventoryQty.qbl b/_Main/BL/Type_MachiningPipelineRow/Attribute_DLInventoryQty.qbl
new file mode 100644
index 0000000..7de5683
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineRow/Attribute_DLInventoryQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute DLInventoryQty
+{
+ #keys: '3[415136.0.1262801338][415136.0.1262801337][415136.0.1262801339]'
+ Description: 'DL瀹為檯搴撳瓨鏁版嵁'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_MachiningPipelineRow/Method_SetDepartureAndArrivalValue.qbl b/_Main/BL/Type_MachiningPipelineRow/Method_SetDepartureAndArrivalValue.qbl
new file mode 100644
index 0000000..7904258
--- /dev/null
+++ b/_Main/BL/Type_MachiningPipelineRow/Method_SetDepartureAndArrivalValue.qbl
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+#parent: #root
+Method SetDepartureAndArrivalValue (
+ MachiningPipelineColumn column,
+ Boolean iscctodl,
+ Real departureqty,
+ Real arriveqty
+)
+{
+ Description: '璁剧疆绂诲巶鍒拌揪鏁伴噺'
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-24-2024 (created)
+ cell := selectobject( this, Cell, cell, cell.Column() = column );
+
+ if( iscctodl ){
+ cell.CCToDLDepartureQty( cell.CCToDLDepartureQty() + departureqty );
+ cell.CCToDLArrivalQty( cell.CCToDLArrivalQty() + arriveqty );
+ } else {
+ cell.DLToCCDepartureQty( cell.DLToCCDepartureQty() + departureqty );
+ cell.DLToCCArrivalQty( cell.DLToCCArrivalQty() + arriveqty );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl
index 718c62f..f58ef1b 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Download.qbl
@@ -78,39 +78,39 @@
//Attribute
//闀挎槬瑁呴厤璁″垝
ccaqcellElement := xmlDOM.CreateElement( "cell" );
- ccaqcellElement.SetAttribute( "value", '闀挎槬瑁呴厤璁″垝' );//CCAssemblyPlanQty
+ ccaqcellElement.SetAttribute( "value", 'CC瑁呴厤璁″垝' );//CCAssemblyPlanQty
attricolumnelement.AppendChild( ccaqcellElement );
//闀挎槬鐢熶骇璁″垝
ccpqcellElement := xmlDOM.CreateElement( "cell" );
- ccpqcellElement.SetAttribute( "value", '闀挎槬鐢熶骇璁″垝' );//CCProductionQty
+ ccpqcellElement.SetAttribute( "value", 'CC鏈哄姞璁″垝' );//CCProductionQty
attricolumnelement.AppendChild( ccpqcellElement );
//闀挎槬璋冩嫧璁″垝
cctqcellElement := xmlDOM.CreateElement( "cell" );
- cctqcellElement.SetAttribute( "value", '闀挎槬璋冩嫧璁″垝' );//CCTransferQty
+ cctqcellElement.SetAttribute( "value", 'CC to DL' );//CCTransferQty
attricolumnelement.AppendChild( cctqcellElement );
//闀挎槬搴撳瓨
cciqcellElement := xmlDOM.CreateElement( "cell" );
- cciqcellElement.SetAttribute( "value", '闀挎槬搴撳瓨' );//CCInventoryQty
+ cciqcellElement.SetAttribute( "value", 'CC搴撳瓨' );//CCInventoryQty
attricolumnelement.AppendChild( cciqcellElement );
//澶ц繛瑁呴厤璁″垝
dlaqcellElement := xmlDOM.CreateElement( "cell" );
- dlaqcellElement.SetAttribute( "value", '澶ц繛瑁呴厤璁″垝' );//DLAssemblyPlanQty
+ dlaqcellElement.SetAttribute( "value", 'DL瑁呴厤璁″垝' );//DLAssemblyPlanQty
attricolumnelement.AppendChild( dlaqcellElement );
//澶ц繛鐢熶骇璁″垝
dlpqcellElement := xmlDOM.CreateElement( "cell" );
- dlpqcellElement.SetAttribute( "value", '澶ц繛鐢熶骇璁″垝' );//DLProductionQty
+ dlpqcellElement.SetAttribute( "value", 'DL鏈哄姞璁″垝' );//DLProductionQty
attricolumnelement.AppendChild( dlpqcellElement );
//澶ц繛璋冩嫧璁″垝
dltqcellElement := xmlDOM.CreateElement( "cell" );
- dltqcellElement.SetAttribute( "value", '澶ц繛璋冩嫧璁″垝' );//DLTransferQty
+ dltqcellElement.SetAttribute( "value", 'DL to CC' );//DLTransferQty
attricolumnelement.AppendChild( dltqcellElement );
//澶ц繛搴撳瓨
dliqcellElement := xmlDOM.CreateElement( "cell" );
- dliqcellElement.SetAttribute( "value", '澶ц繛搴撳瓨' );//DLInventoryQty
+ dliqcellElement.SetAttribute( "value", 'DL搴撳瓨' );//DLInventoryQty
attricolumnelement.AppendChild( dliqcellElement );
//闀挎槬 + 澶ц繛 搴撳瓨
tiqcellElement := xmlDOM.CreateElement( "cell" );
- tiqcellElement.SetAttribute( "value", '闀挎槬 + 澶ц繛搴撳瓨' );//TotalInventoryQty
+ tiqcellElement.SetAttribute( "value", 'CC + DL搴撳瓨' );//TotalInventoryQty
attricolumnelement.AppendChild( tiqcellElement );
}
//闀挎槬瑁呴厤璁″垝
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
index 9d3c315..40fb9c9 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
@@ -8,6 +8,7 @@
[*
// 鐢勫叞楦� Jun-24-2024 (created)
owner.FinancialProductionSource( relflush );
+ startinventorydate := owner.StartOfPlanning() - Duration::Days( 1 );
productparent := MachiningPipelineReport::GetDefaultProductParent();
source := owner.MachiningPipelineSource( relnew, Name := MachiningPipelineReport::GetDefaultName() );
table := source.Report( relnew, ID := source.Name(), Name := source.Name() );
@@ -18,7 +19,7 @@
products := construct( Product_MPs );
//鍒濆鍖栧垪
table.GenerateColumn( owner, 'All', search.StartDate(), search.EndDate() );
- endperiod := maxobject( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day(), period.StartDate() );
+ //endperiod := maxobject( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day(), period.StartDate() );
//鐢熸垚瑁呴厤(闀垮唴搴�)銆佺敓浜э紙鐨凞L鍜屽簱瀛樻暟鎹�
traverse( owner, StockingPoint_MP, stockingpoint ){
@@ -31,47 +32,73 @@
if( iscc or isdl ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and not pisp.IsSystem()// and pisp.ProductID() = '06K103011CM'
and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent )
- and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 or pispip.DependentDemandAndSalesDemandQuantity() <> 0 ) ) ){
+ and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.DependentDemandAndSalesDemandQuantity() <> 0 ) ) ){
isccassemnly := stockingpoint.ID().EndsWith( pisp.Product_MP().ParentID() + '绾胯竟搴�' ) and ( stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '闀挎槬' ) );
isdlassemnly := stockingpoint.ID().EndsWith( pisp.Product_MP().ParentID() ) and ( stockingpoint.ID().StartsWith( 'DL' ) or stockingpoint.ID().StartsWith( '澶ц繛' ) );
pispips := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical()
- and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 or pispip.DependentDemandAndSalesDemandQuantity() <> 0 ), pispip.Start() );
+ and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.DependentDemandAndSalesDemandQuantity() <> 0 ), pispip.Start() );
+ products.Add( pisp.Product_MP() );
+ row := table.GetRow( pisp.ProductID() );
+ inventoryqty := sum( pisp, ProductInStockingPointInPeriod, pispip, pispip.Start() = startinventorydate and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and pispip.ActualInventoryLevelEnd() <> 0, pispip.ActualInventoryLevelEnd() );
+ if( iscc ){
+ row.CCInventoryQty( inventoryqty );
+ }else{
+ row.DLInventoryQty( inventoryqty );
traverse( pispips, Elements, pispip){//, pispip.Start().Month() = 1 and pispip.Start().Day() = 2
- products.Add( pisp.Product_MP() );
-
+
//澶�
daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), pispip.Start().Date() );
//鍛�
- weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), pispip.Start().Date() );
-
- row := table.GetRow( pisp.ProductID() );
-
+ // weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), pispip.Start().Date() );
if( isccassemnly or isdlassemnly ){
//瑁呴厤绾�
quantity := [Number]pispip.DependentDemandAndSalesDemandQuantity();//鍥涜垗浜斿叆
row.SetAssemblyPlanValue( daycolumn, isccassemnly, [Real]quantity );
- row.SetAssemblyPlanValue( weekcolumn, isccassemnly, [Real]quantity );
+ // row.SetAssemblyPlanValue( weekcolumn, isccassemnly, [Real]quantity );
//鐢熶骇
supplyqty := [Number]pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
// info( '****************', quantity, supplyqty );
row.SetCellProductionValue( daycolumn, isccassemnly, [Real]supplyqty );
- row.SetCellProductionValue( weekcolumn, isccassemnly, [Real]supplyqty );
+ // row.SetCellProductionValue( weekcolumn, isccassemnly, [Real]supplyqty );
}
//搴撳瓨
- if( iscc or isdl ){
- inventoryqty := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
- row.SetCellInventoryValue( daycolumn, iscc, [Real]inventoryqty );
- if( weekcolumn.EndDate() = pispip.Start().Date() or pispip.Period_MP() = endperiod ){
- row.SetCellInventoryValue( weekcolumn, iscc, [Real]inventoryqty );
- }
+ // if( iscc or isdl ){
+ // inventoryqty := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
+ // row.SetCellInventoryValue( daycolumn, iscc, [Real]inventoryqty );
+ // if( weekcolumn.EndDate() = pispip.Start().Date() or pispip.Period_MP() = endperiod ){
+ // row.SetCellInventoryValue( weekcolumn, iscc, [Real]inventoryqty );
+ // }
}
}
}
}
}
-
+ //鐢熸垚璋冩嫧鏁版嵁
+ traverse( owner, Unit.Lane.LaneLeg, laneleg ){
+ originspid := laneleg.OriginStockingPointID();
+ destinationspid := laneleg.DestinationStockingPointID();
+ //CC to DL 闀挎槬鍘傚唴搴撳埌澶ц繛澶栫搴�
+ iscctodl := originspid.EndsWith( '鍘傚唴搴�' ) and ( originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' ) ) and destinationspid = '澶ц繛澶栫搴�';
+ //DL to CC 澶ц繛鍘傚唴搴撳埌澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�
+ isdltocc := originspid.EndsWith( '鍘傚唴搴�' ) and ( originspid.StartsWith( '澶ц繛' ) or originspid.StartsWith( 'DL' ) ) and destinationspid = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
+ if( iscctodl and isdltocc ){
+ 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() )
+ or ( trip.Departure().Date() < column.StartDate().StartOfNextMonth() and trip.Departure().Date() >= column.StartDate() ) );
+ producttrips := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent ), pit.ProductID() );
+ traverse( producttrips, Elements, producttrip ){//, producttrip = '6912'
+ row := table.GetRow( producttrip );
+ product := selectobject( owner, Product_MP, product, product.ID() = producttrip );
+ products.Add( product );
+ departureqty := sum( alltrips, Elements.ProductInTrip, pit, ( pit.Trip().Departure().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Departure().Date() >= column.StartDate() ) and pit.Product_MP() = product, pit.Quantity() );
+ arrivalqty := sum( alltrips, Elements.ProductInTrip, pit, ( pit.Trip().Arrival().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Arrival().Date() >= column.StartDate() ) and pit.Product_MP() = product, pit.Quantity() );
+ row.SetDepartureAndArrivalValue( column, iscctodl, departureqty, arrivalqty );
+ }
+ }
+ }
+ }
//鐢熸垚璋冩嫧鏁版嵁
traverse( owner, TransferPlanRow, tprow ){
product := selectobject( owner, Product_MP, product, product.ID() = tprow.ProductID() );
@@ -95,25 +122,25 @@
//澶�
daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), tpcell.TransferPlanColumn().ColumnDate() );
//鍛�
- weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), tpcell.TransferPlanColumn().ColumnDate() );
+ // weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), tpcell.TransferPlanColumn().ColumnDate() );
quantity := [Real]tpcell.Value();//鍥涜垗浜斿叆
if( not isnull( daycolumn ) ){
row.SetCellTransferValue( daycolumn, ( originiscc and destiisdl ), quantity );
}
- if( not isnull( weekcolumn ) ){
- row.SetCellTransferValue( weekcolumn, ( originiscc and destiisdl ), quantity );
- }
+ // if( not isnull( weekcolumn ) ){
+ // row.SetCellTransferValue( weekcolumn, ( originiscc and destiisdl ), quantity );
+ // }
}
}
}
}
- rows := selectsortedset( table, Row, row, row.Name() );
- i := 0;
- traverse( rows, Elements, e ){
- e.RowNr( i );
- i := i + 1;
- }
+ //rows := selectsortedset( table, Row, row, row.Name() );
+ //i := 0;
+ //traverse( rows, Elements, e ){
+ // e.RowNr( i );
+ // i := i + 1;
+ //}
showtable.Generate( search, products );
*]
}
--
Gitblit v1.9.3