From 489256930a3db0c94fc783c307d134b6ff918ce4 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 20 八月 2024 15:25:46 +0800
Subject: [PATCH] 修复Forecast计划周期之外的数据
---
_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def | 2 +-
_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
index 4f22293..a24173c 100644
--- a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
@@ -11,7 +11,7 @@
f.Delete();
}
- traverse ( archiveExecutionStatus, TemporaryDemandData, tdd ) {
+ traverse ( archiveExecutionStatus, TemporaryDemandData, tdd ,tdd.StartDate() >= macroPlan.StartOfPlanning().Date()) {
targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = tdd.ProductID() );
targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = tdd.StockingPointID() );
info( tdd.SalesSegmentName() );
@@ -29,8 +29,7 @@
tdd.UnitOfMeasureName(),
0.0,
false,
- false
- );
+ false );
forcest.Origin( tdd.Origin() );
}
}
diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
index 0990048..bead82a 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
@@ -41,7 +41,7 @@
if( not isnull( columnIndex )){
// 褰揳rrowedAvailableCapacity涓嶄负0锛屽伐浣滄棩 + 1
arrowedAvailableCapacity := unitPeriodTime.TotalAvailableCapacity();
- zeroDuration := Duration::Construct( 0,0,0,0);
+ zeroDuration := Duration::Construct( 0,0,0,0 );
column := columns.Element( columnIndex.GetValueAsNumber() );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def
index 7b630bf..9d82f9b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def
@@ -10,7 +10,7 @@
Body:
[*
macroPlans := ApplicationMacroPlanner.GetMacroPlans();
- table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive);
+ table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
dhComparisonData854.Data( table );
*]
--
Gitblit v1.9.3