From e8be76a40ae0b3cb1d37a6e91e25c1284a50347f Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期四, 21 九月 2023 20:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl b/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl
index 69f306b..2f62201 100644
--- a/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl
+++ b/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart.qbl
@@ -13,7 +13,11 @@
MacroPlan mappingParent
)
{
- Description: '鎸夊叆鍙傚鐞嗘暟鎹紝浜х敓闇�瑕佺殑CapacityAndSaleBudgeChartElement'
+ Description:
+ [*
+ 鎸夊叆鍙傚鐞嗘暟鎹紝浜х敓闇�瑕佺殑CapacityAndSaleBudgeChartElement
+ 锛侊紒锛侊紒搴熷純锛侊紒锛侊紒
+ *]
TextBody:
[*
// yypsybs Sep-19-2023 (created)
@@ -56,18 +60,20 @@
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByPlaceOfProductionOfArray( rows, placeOfProductionOfArray );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-鐩爣",
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetByYear( productCodeList, mpSync, [Number]year ),
- MappingForecast::GetQuantityByYear( productCodeList, mappingParent, [Number]year ) )
+ // todo QID 23
+ MappingAnnualBudget::GetSheetByYear( productCodeList, mpSync, [Number]year ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyByYear( productCodeList, macroPlan, [Number]year ),
+ // todo
0.0 )
);
}
@@ -79,16 +85,16 @@
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByPlaceOfProductionOfArray( rows, placeOfProductionOfArray );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-鐩爣",
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetByHalfYear( productCodeList, mpSync, [Number]year, halfNo ),
- MappingForecast::GetQuantityByHalfYear( productCodeList, mappingParent, [Number]year, halfNo ) )
+ MappingAnnualBudget::GetSheetByHalfYear( productCodeList, mpSync, [Number]year, halfNo ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyByHalfYear( productCodeList, macroPlan, [Number]year, halfNo ),
0.0 )
@@ -106,17 +112,17 @@
// info( "seasonNo : " + [String]seasonNo );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-鐩爣",
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ),
- MappingForecast::GetQuantityBySeason( productCodeList, mappingParent, [Number]year, seasonNo ) )
+ MappingAnnualBudget::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ) )
);
// info( "productCodeList : " + [String]productCodeList.Size() );
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyBySeason( productCodeList, macroPlan, [Number]year, seasonNo ),
0.0 )
@@ -127,20 +133,21 @@
}
if ( byBusinessTypeOrByOrgCode = "闈㈡澘鍩哄湴" and groupBy = "鏈�" ) {
for( monthNo := 1; monthNo <= 12; monthNo := monthNo + 1 ) {
+ monthNoString := ifexpr( monthNo <= 9, "0" + [String]monthNo, [String]monthNo );
traverse( placeOfProductionOfArrayList, Elements, placeOfProductionOfArray ) {
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByPlaceOfProductionOfArray( rows, placeOfProductionOfArray );
this.CapacityAndSaleBudgeChartElement( relnew,
- TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-鐩爣",
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ TimeStringAndScenarioName := [String]year + "骞�-绗�" + monthNoString + "鏈�-鐩爣",
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetByMonth( productCodeList, mpSync, [Number]year, monthNo ),
- MappingForecast::GetQuantityByMonth( productCodeList, mappingParent, [Number]year, monthNo ) )
+ MappingAnnualBudget::GetSheetByMonth( productCodeList, mpSync, [Number]year, monthNo ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
- TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := placeOfProductionOfArray,
+ TimeStringAndScenarioName := [String]year + "骞�-绗�" + monthNoString + "鏈�-" + macroPlan.ScenarioName(),
+ BusinessTypeOrPlaceOfProductionOfArray := placeOfProductionOfArray,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyByMonth( productCodeList, macroPlan, [Number]year, monthNo ),
0.0 )
@@ -155,16 +162,16 @@
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByBusinessType( rows, businessType );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-鐩爣",
- BusinessTypeOrOrgCode := businessType,
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetByYear( productCodeList, mpSync, [Number]year ),
- MappingForecast::GetQuantityByYear( productCodeList, mappingParent, [Number]year ) )
+ MappingAnnualBudget::GetSheetByYear( productCodeList, mpSync, [Number]year ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := businessType,
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyByYear( productCodeList, macroPlan, [Number]year ),
0.0 )
@@ -178,16 +185,16 @@
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByBusinessType( rows, businessType );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-鐩爣",
- BusinessTypeOrOrgCode := businessType,
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetByHalfYear( productCodeList, mpSync, [Number]year, halfNo ),
- MappingForecast::GetQuantityByHalfYear( productCodeList, mappingParent, [Number]year, halfNo ) )
+ MappingAnnualBudget::GetSheetByHalfYear( productCodeList, mpSync, [Number]year, halfNo ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-" + ifexpr( halfNo = 1, "涓�", "涓�" ) + "鍗婂勾-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := businessType,
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyByHalfYear( productCodeList, macroPlan, [Number]year, halfNo ),
0.0 )
@@ -202,16 +209,16 @@
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByBusinessType( rows, businessType );
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-鐩爣",
- BusinessTypeOrOrgCode := businessType,
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ),
- MappingForecast::GetQuantityBySeason( productCodeList, mappingParent, [Number]year, seasonNo ) )
+ MappingAnnualBudget::GetSheetBySeason( productCodeList, mpSync, [Number]year, seasonNo ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]seasonNo + "瀛ｅ害-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := businessType,
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyBySeason( productCodeList, macroPlan, [Number]year, seasonNo ),
0.0 )
@@ -222,20 +229,21 @@
}
if ( byBusinessTypeOrByOrgCode = "浜嬩笟閮�" and groupBy = "鏈�" ) {
for( monthNo := 1; monthNo <= 12; monthNo := monthNo + 1 ) {
+ monthNoString := ifexpr( monthNo <= 9, "0" + [String]monthNo, [String]monthNo );
traverse( businessTypeList, Elements, businessType ) {
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByBusinessType( rows, businessType );
this.CapacityAndSaleBudgeChartElement( relnew,
- TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-鐩爣",
- BusinessTypeOrOrgCode := businessType,
+ TimeStringAndScenarioName := [String]year + "骞�-绗�" + monthNoString + "鏈�-鐩爣",
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
MappingCapacityAndSaleBudge::GetSheetByMonth( productCodeList, mpSync, [Number]year, monthNo ),
- MappingForecast::GetQuantityByMonth( productCodeList, mappingParent, [Number]year, monthNo ) )
+ MappingAnnualBudget::GetSheetByMonth( productCodeList, mpSync, [Number]year, monthNo ) )
);
// S&OP
traverse( macroPlans, Elements, macroPlan ) {
this.CapacityAndSaleBudgeChartElement( relnew,
- TimeStringAndScenarioName := [String]year + "骞�-绗�" + [String]monthNo + "鏈�-" + macroPlan.ScenarioName(),
- BusinessTypeOrOrgCode := businessType,
+ TimeStringAndScenarioName := [String]year + "骞�-绗�" + monthNoString + "鏈�-" + macroPlan.ScenarioName(),
+ BusinessTypeOrPlaceOfProductionOfArray := businessType,
Quantity := ifexpr( isCapacity,
Product_MP::GetNewSupplyByMonth( productCodeList, macroPlan, [Number]year, monthNo ),
0.0 )
--
Gitblit v1.9.3