From bc0a06655cb1cc8f661c7ad869ebab70ecc561bb Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期二, 09 七月 2024 09:05:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
index 8f63f1f..804d079 100644
--- a/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
@@ -23,7 +23,7 @@
table := source.FinancialSalesReport( relnew, ID := source.Name(), Name := source.Name(), IsImport := false );
showtable := source.FinancialSalesReport( relnew, ID := source.Name() + 'Show', Name := source.Name(), IsImport := false, IsShow := true );
startofplanning := owner.StartOfPlanning();
- startofyear := startofplanning.StartOfYear();
+ //startofyear := startofplanning.StartOfYear();
startofnextyear := startofplanning.StartOfNextYear();
search := source.FinancialSalesSearch( relnew, Unit := allsalessegment, Generation := allsalessegment, MqbMlb := allsalessegment, Power := allsalessegment );
@@ -34,7 +34,7 @@
traverse( owner, SalesDemand.astype( Forecast ), forecast, forecast.StartDate() < startofnextyear.Date() and ( ( forecast.SalesSegmentName() = ccsalessegment and forecast.Product_MP().MQBMLB() = 'MLB' )
or forecast.SalesSegmentName() = tjsalessegment or forecast.SalesSegmentName() = fssalessegment ) ){
product := forecast.Product_MP();
- allrow := table.GetRow( allsalessegment, product.ID(), startofyear, startofnextyear );
+ allrow := table.GetRow( allsalessegment, product.ID() );
periodtime := forecast.StartDate().StartOfMonth();
periodname := periodtime.Format( "M2/D2/Y" );
@@ -47,13 +47,13 @@
//Forecast鐨凷ales Segment涓洪暱鏄ワ紝璇嗗埆鍑篗LB鐨勬墍鏈変骇鍝佹眹鎬�
if( forecast.SalesSegmentName() = ccsalessegment and product.MQBMLB() = 'MLB' ){
// info( '------------------------', column.Name() );
- ccrow := table.GetRow( ccsalessegment, product.ID(), startofyear, startofnextyear );
+ ccrow := table.GetRow( ccsalessegment, product.ID() );
// info( '------------------------', ccrow.FinancialSalesCell( relsize ), column.FinancialSalesCell( relsize ) );
ccrow.Initialize( column, forecast.Quantity() );
}else if( forecast.SalesSegmentName() = tjsalessegment or forecast.SalesSegmentName() = fssalessegment ){
//澶ц繛璐㈠姟閿�閲忥細棣栧厛鍦╢orecast鐣岄潰鏌ユ壘Sales Segment鏄ぉ娲ュ拰浣涘北鐨勬墍鏈夐渶姹傦紝姣忎釜浜у搧鎸夋湀姹囨�婚渶姹傛暟閲�
// info( '------------------------', column.Name() );
- dlrow := table.GetRow( dlsalessegment, product.ID(), startofyear, startofnextyear );
+ dlrow := table.GetRow( dlsalessegment, product.ID() );
// info( '------------------------', dlrow.FinancialSalesCell( relsize ), column.FinancialSalesCell( relsize ) );
dlrow.Initialize( column, forecast.Quantity() );
}
@@ -67,10 +67,10 @@
periodtime := pispip.Start().StartOfMonth().Date();
periodname := periodtime.Format( "M2/D2/Y" );
column := selectobject( table, FinancialSalesColumn, column, column.Name() = periodname and column.Period() = periodtime );
- ccrow := table.GetRow( ccsalessegment, product.ID(), startofyear, startofnextyear );
+ ccrow := table.GetRow( ccsalessegment, product.ID() );
ccrow.Initialize( column, pispip.DependentDemandAndSalesDemandQuantity() );//鍙朤otal Demand瀛楁鎸夋湀姹囨�婚渶姹傛暟閲�
- allrow := table.GetRow( allsalessegment, product.ID(), startofyear, startofnextyear );
+ allrow := table.GetRow( allsalessegment, product.ID() );
allrow.Initialize( column, pispip.DependentDemandAndSalesDemandQuantity() );
}
}
@@ -84,10 +84,10 @@
column := selectobject( table, FinancialSalesColumn, column, column.Name() = periodname and column.Period() = periodtime );
traverse( trip, ProductInTrip, pit ){
- dlrow := table.GetRow( dlsalessegment, pit.ProductID(), startofyear, startofnextyear );
+ dlrow := table.GetRow( dlsalessegment, pit.ProductID() );
dlrow.Initialize( column, pit.Quantity() );//鍙朤otal Demand瀛楁鎸夋湀姹囨�婚渶姹傛暟閲�
- allrow := table.GetRow( allsalessegment, pit.ProductID(), startofyear, startofnextyear );
+ allrow := table.GetRow( allsalessegment, pit.ProductID() );
allrow.Initialize( column, pit.Quantity() );
}
}
--
Gitblit v1.9.3