From fe28d603a518b0561ab684570e71c0d2811329ab Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 15 八月 2024 14:02:45 +0800
Subject: [PATCH] 发动机管线报表bug
---
_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
index 0d45aa5..f9e39e3 100644
--- a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
@@ -47,7 +47,7 @@
//澶�
daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), pispip.Start().Date() );
//鍛�
- weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), weekstart );
+ weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), pispip.Start().Date() );
supplyquantity := [Number]pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
inventoryquantity := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
//浜ч噺鏄姞鎬�
@@ -68,16 +68,16 @@
}
//鐢熸垚闇�姹傛暟鎹�
- traverse( owner, SalesDemand.astype( Forecast ), forecast, forecast.StartDate() < endperiod.StartDate() and forecast.Quantity() <> 0
+ 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 )
and exists( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() <> 0 ) ){
row := table.GetRow( forecast.ProductID() );
- weekstart := owner.StartOfPlanning().Date();
+ // weekstart := owner.StartOfPlanning().Date();
traverse( forecast, PlanningSalesDemandInPeriod, psdip, psdip.Quantity() <> 0 ){
//澶�
daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), psdip.StartDate() );
//鍛�
- weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), weekstart );
+ weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), psdip.StartDate() );
if( not isnull( daycolumn ) ){
row.SetCellDemandValue( daycolumn, forecast.SalesSegmentName(), forecast.Quantity() );
@@ -85,9 +85,9 @@
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();
- }
+ // if( psdip.StartDate() = ( weekstart + Duration::Days( 6 ) ).Date() or psdip.PeriodStart() = endperiod.StartDate() ){
+ // weekstart := ( weekstart + Duration::Days( 7 ) ).Date();
+ // }
}
}
--
Gitblit v1.9.3