From c7b725a4e060747e46c9f7551e69536c6bca6eca Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 27 九月 2024 13:36:14 +0800
Subject: [PATCH] 财务销量报表数据处理
---
_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl b/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl
index 5bc515f..bfd4632 100644
--- a/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/StaticMethod_InitializeNew.qbl
@@ -14,8 +14,8 @@
ccunit := FinancialSalesReport::GetDefaultCCUnit();
dlunit := FinancialSalesReport::GetDefaultDLUnit();
ccsalessegment := FinancialSalesReport::GetSalesSegmentCC();
- //tjsalessegment := FinancialSalesReport::GetSalesSegmentTJ();
- //fssalessegment := FinancialSalesReport::GetSalesSegmentFS();
+ tjsalessegment := FinancialSalesReport::GetSalesSegmentTJ();
+ fssalessegment := FinancialSalesReport::GetSalesSegmentFS();
//ccspline := FinancialSalesReport::GetStockingPointCCLine();
//dlspline := FinancialSalesReport::GetStockingPointDLLine();
//ccrent := FinancialSalesReport::GetStockingPointCCRent();
@@ -41,14 +41,17 @@
//鏄惁灞炰簬闀挎槬
iscc := salessegment.Name().StartsWith( ccsalessegment ) or exists( parentsalessegments, Elements, psalessegment, psalessegment.Name().StartsWith( ccsalessegment ) );
isccrent := iscc and stockingpoint.EndsWith( '澶栫搴�' ) and ( stockingpoint.StartsWith( 'CC' ) or stockingpoint.StartsWith( '闀挎槬' ) );
+ isdl := salessegment.Name().StartsWith( tjsalessegment ) or salessegment.Name().StartsWith( fssalessegment )
+ or exists( parentsalessegments, Elements, psalessegment, psalessegment.Name().StartsWith( tjsalessegment ) )
+ or exists( parentsalessegments, Elements, psalessegment, psalessegment.Name().StartsWith( fssalessegment ) );
//Forecast鐨凷ales Segment涓洪暱鏄ワ紝璇嗗埆鍑篗LB鐨勬墍鏈変骇鍝佹眹鎬�
//澶ц繛璐㈠姟閿�閲忥細棣栧厛鍦╢orecast鐣岄潰鏌ユ壘Sales Segment鏄ぉ娲ュ拰浣涘北鐨勬墍鏈夐渶姹傦紝姣忎釜浜у搧鎸夋湀姹囨�婚渶姹傛暟閲� and forecast.Product_MP().MQBMLB() = 'MLB' )
- if( ( iscc and product.MQBMLB() = 'MLB' ) or ( isccrent and product.MQBMLB() = 'MQB' ) ){
+ if( ( iscc and product.MQBMLB() = 'MLB' ) or ( isccrent and product.MQBMLB() = 'MQB' ) or isdl ){
//鑾峰彇鍚堣琛�
allrow := table.GetRow( allunit, product );
//鑾峰彇宸ュ巶琛�
- factoryrow := table.GetRow( ccunit, product );
+ factoryrow := table.GetRow( ifexpr( isdl, dlunit, ccunit ), product );
products.Add( product );
traverse( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() <> 0 ){
--
Gitblit v1.9.3