From acf70acb5438a3358d07978afdc0eb28950f40d5 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 12 八月 2024 16:28:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
index cf1176e..e2ac2ed 100644
--- a/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/StaticMethod_Initialize.qbl
@@ -46,9 +46,9 @@
if( ( iscc and forecast.Product_MP().MQBMLB() = 'MLB' ) or isdl ){
product := forecast.Product_MP();
//鑾峰彇鍚堣琛�
- allrow := table.GetRow( allunit, product.ID() );
+ allrow := table.GetRow( allunit, product );
//鑾峰彇宸ュ巶琛�
- factoryrow := table.GetRow( ifexpr( iscc and forecast.Product_MP().MQBMLB() = 'MLB', ccunit, dlunit ), product.ID() );
+ factoryrow := table.GetRow( ifexpr( iscc and forecast.Product_MP().MQBMLB() = 'MLB', ccunit, dlunit ), product );
if( products.Find( product ) < 0 ){
products.Add( product );
@@ -59,7 +59,7 @@
// info( '-------------------------', periodname, periodtime );
column := selectobject( table, FinancialSalesColumn, column, column.Name() = periodname and column.Period() = periodtime );
// info( '-------------------------', column.Name() );
- quantity := ceil( psdip.Quantity() );//鍚戜笂鍙栨暣
+ quantity := [Number]psdip.Quantity();//鍥涜垗浜斿叆
factoryrow.Initialize( column, quantity );
allrow.Initialize( column, quantity );
@@ -74,13 +74,13 @@
// iscc := unit.ID() = ccspline or exists( parentunits, Elements, punit, punit.ID() = ccspline );
if( table.IsInUnit( stockingpoint, ccspline ) ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and pisp.Product_MP().MQBMLB() = 'MQB' ){//浜у搧涓篗QB
- allrow := table.GetRow( allunit, pisp.ProductID() );
- ccrow := table.GetRow( ccunit, pisp.ProductID() );
+ allrow := table.GetRow( allunit, pisp.Product_MP() );
+ ccrow := table.GetRow( ccunit, pisp.Product_MP() );
traverse( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().StartDate() < startofnextyear ){
periodtime := pispip.Start().StartOfMonth().Date();
periodname := periodtime.Format( "M2/D2/Y" );
column := selectobject( table, FinancialSalesColumn, column, column.Name() = periodname and column.Period() = periodtime );
- quantity := ceil( pispip.DependentDemandAndSalesDemandQuantity() );//鍚戜笂鍙栨暣
+ quantity := [Number]pispip.DependentDemandAndSalesDemandQuantity();//鍥涜垗浜斿叆
ccrow.Initialize( column, quantity );//鍙朤otal Demand瀛楁鎸夋湀姹囨�婚渶姹傛暟閲�
allrow.Initialize( column, quantity );
@@ -104,11 +104,11 @@
column := selectobject( table, FinancialSalesColumn, column, column.Name() = periodname and column.Period() = periodtime );
traverse( trip, ProductInTrip, pit ){
- quantity := ceil( pit.Quantity() );//鍚戜笂鍙栨暣
- dlrow := table.GetRow( dlunit, pit.ProductID() );
+ quantity := [Number]pit.Quantity();//鍥涜垗浜斿叆
+ dlrow := table.GetRow( dlunit, pit.Product_MP() );
dlrow.Initialize( column, quantity );//姹囨�绘暟閲�
- allrow := table.GetRow( allunit, pit.ProductID() );
+ allrow := table.GetRow( allunit, pit.Product_MP() );
allrow.Initialize( column, quantity );
}
}
--
Gitblit v1.9.3