From d6bd7a69bc31efa79b21c7be12ba9547a921c251 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期五, 03 十一月 2023 16:28:41 +0800
Subject: [PATCH] 年度产销预算BUG修改
---
_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl b/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl
index 8b53f33..5215a43 100644
--- a/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl
+++ b/_Main/BL/Type_GlobalOTDSOP/Method_CapacityAndSaleBudgeCompare.qbl
@@ -2,40 +2,41 @@
#parent: #root
Method CapacityAndSaleBudgeCompare (
MacroPlans macroPlans,
- CapacityAndSaleBudgeFilterItems items,
- CapacityAndSaleBudgeFilterYears years,
- CapacityAndSaleBudgeFilterMonths months,
+ owning CapacityAndSaleBudgeFilterItems items,
+ owning CapacityAndSaleBudgeFilterPlaceOfProductionOfArrays casbfpopoas,
+ owning CapacityAndSaleBudgeFilterBusinessTypes casbfbts,
+ owning CapacityAndSaleBudgeFilterYears years,
+ owning CapacityAndSaleBudgeFilterMonths months,
const GlobalOTDTable globalOTDTable
)
{
Description: 'todo : mappingParent鏀逛负mpSync, random鍒犱簡'
TextBody:
[*
- if ( years.Size() = 0 ) {
- years := selectset( this, CapacityAndSaleBudgeFilterYear, tempCASBFY, tempCASBFY.YearNo() = Date::ActualDate().Year() );
- }
- if ( months.Size() = 0 ) {
- months := selectsortedset( this, CapacityAndSaleBudgeFilterMonth, item, item.MonthNo() );
- }
-
this.CapacityAndSaleBudgeCompareItemRow( relflush );
this.CapacityAndSaleBudgeCompareItemColumn( relflush );
- CapacityAndSaleBudgeCompareItemCell::CreateData( globalOTDTable, this );
+ CapacityAndSaleBudgeCompareItemCell::SetFilterCriteria( this, &items, &casbfpopoas, &casbfbts, &years, &months );
- if ( CapacityAndSaleBudgeFilterItem::Contains( items, "闈㈡澘鍒嗛厤閲�" ) ) {
- traverse ( years, Elements, year ) {
- CapacityAndSaleBudgeCompareItemCell::CreatePanelAllocationBudget( this, months, year, globalOTDTable );
- CapacityAndSaleBudgeCompareItemCell::CreatePanelAllocationByScenario( macroPlans, this, months, year );
- }
- }
+ CapacityAndSaleBudgeCompareItemCell::GenerateBasicDataBasedOnFilteringCriteria( this, globalOTDTable, items, casbfpopoas, casbfbts );
- if ( CapacityAndSaleBudgeFilterItem::Contains( items, "閿�鍞" ) ) {
- traverse ( years, Elements, year ) {
- CapacityAndSaleBudgeCompareItemCell::CreateSalesVolume( this, months, year, globalOTDTable );
- CapacityAndSaleBudgeCompareItemCell::CreateSalesVolumeByScenario( macroPlans, this, months, year );
- }
- }
+ CapacityAndSaleBudgeCompareItemCell::CreateSalesVolumeData( macroPlans, globalOTDTable, this, items, years, months );
+
+ CapacityAndSaleBudgeCompareItemCell::CreatePanelAllocation( macroPlans, globalOTDTable, this, items, years, months );
+
+ //if ( CapacityAndSaleBudgeFilterItem::Contains( items, "闈㈡澘鍒嗛厤閲�" ) ) {
+ // traverse ( years, Elements, year ) {
+ // CapacityAndSaleBudgeCompareItemCell::CreatePanelAllocationBudget( this, months, year, globalOTDTable );
+ // CapacityAndSaleBudgeCompareItemCell::CreatePanelAllocationByScenario( macroPlans, this, months, year );
+ // }
+ //}
+ //
+ //if ( CapacityAndSaleBudgeFilterItem::Contains( items, "閿�鍞" ) ) {
+ // traverse ( years, Elements, year ) {
+ // CapacityAndSaleBudgeCompareItemCell::CreateSalesVolume( this, months, year, globalOTDTable );
+ // CapacityAndSaleBudgeCompareItemCell::CreateSalesVolumeByScenario( macroPlans, this, months, year );
+ // }
+ //}
// 澶у紶鐩堝埄棰�
//traverse ( years, Elements, year ) {
@@ -74,16 +75,16 @@
//}
// 璁剧疆rowNo鍜宑olumnNo
- rowNo := 1;
- rowSorted := selectsortedset( this, CapacityAndSaleBudgeCompareItemRow, item, item.PlaceOfProductionOfArray() + "_" + item.BusinessType() );
- traverse( rowSorted, Elements, item ) {
- item.RowNo( rowNo );
- rowNo := rowNo + 1;
- }
- columnNo := 1;
- traverse( this, CapacityAndSaleBudgeCompareItemColumn, item ) {
- item.ColumnNo( columnNo );
- columnNo := columnNo + 1;
- }
+ //rowNo := 1;
+ //rowSorted := selectsortedset( this, CapacityAndSaleBudgeCompareItemRow, item, item.PlaceOfProductionOfArray() + "_" + item.BusinessType() );
+ //traverse( rowSorted, Elements, item ) {
+ // item.RowNo( rowNo );
+ // rowNo := rowNo + 1;
+ //}
+ //columnNo := 1;
+ //traverse( this, CapacityAndSaleBudgeCompareItemColumn, item ) {
+ // item.ColumnNo( columnNo );
+ // columnNo := columnNo + 1;
+ //}
*]
}
--
Gitblit v1.9.3