From 91f5cf28f64aa9c990738398dd62f253647a3639 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期四, 21 九月 2023 10:25:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl b/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl
index 43f414f..69f306b 100644
--- a/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl
+++ b/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl
@@ -32,19 +32,21 @@
this.CapacityAndSaleBudgeChartElement( relflush );
// ====鎸夐潰鏉垮熀鍦板拰浜嬩笟閮ㄥ浜у搧杩涜绛涢�夊垎缁�====
- historyData := selectset( otdTable, CapacityAndSaleBudge, item, true );
+ historyData := selectset( mpSync, MappingCapacityAndSaleBudge, item, true );
if( placeOfProductionOfArrayChosen <> "" ) {
historyData := selectset( historyData, Elements, item, item.PlaceOfProductionOfArray() = placeOfProductionOfArrayChosen );
}
if( businessTypeChosen <> "" ) {
historyData := selectset( historyData, Elements, item, item.BusinessType() = businessTypeChosen );
}
+ //info( "historyData : " + [String]historyData.Size() );
traverse( historyData, Elements, item ) {
row := CapacityAndSaleBudgeChartRow::CreateIfNotExist( this, item.BusinessType(), item.PlaceOfProductionOfArray() );
// 璁板綍姣忚鍖呭惈鍝簺product
CapacityAndSaleBudgeChartRowProduct::CreateIfNotExist( row, item.ProductCode() );
}
rows := selectset( this, CapacityAndSaleBudgeChartRow, item, true );
+ //info( "rows : " + [String]rows.Size() );
placeOfProductionOfArrayList := selectuniquevalues( historyData, Elements, item, item.PlaceOfProductionOfArray() );
businessTypeList := selectuniquevalues( historyData, Elements, item, item.BusinessType() );
// 鐢熸垚鍥捐〃鍏冪礌
@@ -56,10 +58,10 @@
TimeStringAndScenarioName := [String]year + "骞�-鐩爣",
BusinessTypeOrOrgCode := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetByYear( productCodeList, otdTable, [Number]year ),
+ MappingCapacityAndSaleBudge::GetSheetByYear( productCodeList, mpSync, [Number]year ),
MappingForecast::GetQuantityByYear( productCodeList, mappingParent, [Number]year ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + macroPlan.ScenarioName(),
@@ -79,10 +81,10 @@
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-鐩爣",
BusinessTypeOrOrgCode := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetByHalfYear( productCodeList, otdTable, [Number]year, halfNo ),
+ MappingCapacityAndSaleBudge::GetSheetByHalfYear( productCodeList, mpSync, [Number]year, halfNo ),
MappingForecast::GetQuantityByHalfYear( productCodeList, mappingParent, [Number]year, halfNo ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-" + macroPlan.ScenarioName(),
@@ -99,14 +101,18 @@
for( seasonNo := 1; seasonNo <= 4; seasonNo := seasonNo + 1 ) {
traverse( placeOfProductionOfArrayList, Elements, placeOfProductionOfArray ) {
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByPlaceOfProductionOfArray( rows, placeOfProductionOfArray );
+ // info( "productCodeList : " + [String]productCodeList.Size() );
+ // info( "MappingCapacityAndSaleBudge::GetSheetBySeason : " + [String]MappingCapacityAndSaleBudge::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ) );
+ // info( "seasonNo : " + [String]seasonNo );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-鐩爣",
BusinessTypeOrOrgCode := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetBySeason( productCodeList, otdTable, [Number]year, seasonNo ),
+ MappingCapacityAndSaleBudge::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ),
MappingForecast::GetQuantityBySeason( productCodeList, mappingParent, [Number]year, seasonNo ) )
);
- // S&OP
+ // info( "productCodeList : " + [String]productCodeList.Size() );
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-" + macroPlan.ScenarioName(),
@@ -127,10 +133,10 @@
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-鐩爣",
BusinessTypeOrOrgCode := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetByMonth( productCodeList, otdTable, [Number]year, monthNo ),
+ MappingCapacityAndSaleBudge::GetSheetByMonth( productCodeList, mpSync, [Number]year, monthNo ),
MappingForecast::GetQuantityByMonth( productCodeList, mappingParent, [Number]year, monthNo ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-" + macroPlan.ScenarioName(),
@@ -151,10 +157,10 @@
TimeStringAndScenarioName := [String]year + "骞�-鐩爣",
BusinessTypeOrOrgCode := businessType,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetByYear( productCodeList, otdTable, [Number]year ),
+ MappingCapacityAndSaleBudge::GetSheetByYear( productCodeList, mpSync, [Number]year ),
MappingForecast::GetQuantityByYear( productCodeList, mappingParent, [Number]year ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + macroPlan.ScenarioName(),
@@ -174,10 +180,10 @@
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-鐩爣",
BusinessTypeOrOrgCode := businessType,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetByHalfYear( productCodeList, otdTable, [Number]year, halfNo ),
+ MappingCapacityAndSaleBudge::GetSheetByHalfYear( productCodeList, mpSync, [Number]year, halfNo ),
MappingForecast::GetQuantityByHalfYear( productCodeList, mappingParent, [Number]year, halfNo ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-" + macroPlan.ScenarioName(),
@@ -198,10 +204,10 @@
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-鐩爣",
BusinessTypeOrOrgCode := businessType,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetBySeason( productCodeList, otdTable, [Number]year, seasonNo ),
+ MappingCapacityAndSaleBudge::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ),
MappingForecast::GetQuantityBySeason( productCodeList, mappingParent, [Number]year, seasonNo ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-" + macroPlan.ScenarioName(),
@@ -222,10 +228,10 @@
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-鐩爣",
BusinessTypeOrOrgCode := businessType,
Quantity := ifexpr( isCapacity,
- CapacityAndSaleBudge::GetSheetByMonth( productCodeList, otdTable, [Number]year, monthNo ),
+ MappingCapacityAndSaleBudge::GetSheetByMonth( productCodeList, mpSync, [Number]year, monthNo ),
MappingForecast::GetQuantityByMonth( productCodeList, mappingParent, [Number]year, monthNo ) )
);
- // S&OP
+ // S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-" + macroPlan.ScenarioName(),
@@ -238,5 +244,15 @@
}
}
}
+ //info( "CapacityAndSaleBudgeChartElement : " + [String]selectset( this, CapacityAndSaleBudgeChartElement, item, true ).Size() );
+ //traverse( this, CapacityAndSaleBudgeChartRow, row ) {
+ // info( "==鈫�==" );
+ // info( row.BusinessType() );
+ // info( row.PlaceOfProductionOfArray() );
+ // elements := selectset( row, CapacityAndSaleBudgeChartRowProduct, cell, true );
+ // info( elements.Size() );
+ // info( row.GetProductCodes().Concatenate( " | " ) );
+ // info( "==鈫�==" );
+ //}
*]
}
--
Gitblit v1.9.3