From ee6759c54c0ec9ffe92de80268cf3a1d6ecb05a6 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期三, 27 九月 2023 18:14:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/BL/Type_GlobalDTOTable/Method_CapacityAndSaleBudgeChart#156.qbl | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git "a/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart\04395.qbl" "b/_Main/BL/Type_GlobalDTOTable/Method_CapacityAndSaleBudgeChart\043156.qbl"
similarity index 96%
rename from "_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart\04395.qbl"
rename to "_Main/BL/Type_GlobalDTOTable/Method_CapacityAndSaleBudgeChart\043156.qbl"
index c543694..6afbad7 100644
--- "a/_Main/BL/Type_ScenarioManager/Method_CapacityAndSaleBudgeChart\04395.qbl"
+++ "b/_Main/BL/Type_GlobalDTOTable/Method_CapacityAndSaleBudgeChart\043156.qbl"
@@ -25,27 +25,27 @@
// 闈㈡澘鍩哄湴;浜嬩笟閮�
info( byBusinessTypeOrByOrgCode );
traverse( businessTypes, Elements, businessType ) {
- info( "businessType : " + businessType.BusinessType() );
+ debuginfo( "businessType : " + businessType.BusinessType() );
}
traverse( placeOfProductionOfArrays, Elements, placeOfProductionOfArray ) {
- info( "placeOfProductionOfArray : " + placeOfProductionOfArray.PlaceOfProductionOfArray() );
+ debuginfo( "placeOfProductionOfArray : " + placeOfProductionOfArray.PlaceOfProductionOfArray() );
}
traverse( macroPlans, Elements, macroPlan ) {
- info( "macroPlan : " + macroPlan.ScenarioName() );
+ debuginfo( "macroPlan : " + macroPlan.ScenarioName() );
}
// 骞翠唤涓嶉�夋椂鍏ㄩ��
if( years.Size() = 0 ) {
years := selectsortedset( this, CapacityAndSaleBudgeFilterYear, item, true, item.YearNo() );
}
traverse( years, Elements, year ) {
- info( "yearNo : " + [String]year.YearNo() );
+ debuginfo( "yearNo : " + [String]year.YearNo() );
}
// 鏈堜唤涓嶉�夋椂鍏ㄩ��
if( months.Size() = 0 ) {
months := selectsortedset( this, CapacityAndSaleBudgeFilterMonth, item, true, item.MonthNo() );
}
traverse( months, Elements, month ) {
- info( "monthNo : " + [String]month.MonthNo() );
+ debuginfo( "monthNo : " + [String]month.MonthNo() );
}
// ====娓呯悊鏃ф暟鎹�====
@@ -74,7 +74,7 @@
businessTypeList := selectuniquevalues( historyData, Elements, item, item.BusinessType() );
// 鐢熸垚鍥捐〃鍏冪礌
traverse( years, Elements, year ) {
- info( "process year start : " + [String]year.YearNo() );
+ debuginfo( "process year start : " + [String]year.YearNo() );
if( byBusinessTypeOrByOrgCode = "闈㈡澘鍩哄湴" and groupBy = "骞�" ) {
// 鐩爣
traverse( placeOfProductionOfArrayList, Elements, placeOfProductionOfArray ) {
@@ -232,7 +232,7 @@
}
if ( byBusinessTypeOrByOrgCode = "浜嬩笟閮�" and groupBy = "瀛ｅ害" ) {
for( seasonNo := 1; seasonNo <= 4; seasonNo := seasonNo + 1 ) {
- info( "process season start : " + [String]seasonNo );
+ debuginfo( "process season start : " + [String]seasonNo );
traverse( businessTypeList, Elements, businessType ) {
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByBusinessType( rows, businessType );
this.CapacityAndSaleBudgeChartElement( relnew,
@@ -259,7 +259,7 @@
}
if ( byBusinessTypeOrByOrgCode = "浜嬩笟閮�" and groupBy = "鏈�" ) {
traverse( months, Elements, month ) {
- info( "process month start : " + [String]month.MonthNo() );
+ debuginfo( "process month start : " + [String]month.MonthNo() );
monthNoString := ifexpr( month.MonthNo() <= 9, "0" + [String]month.MonthNo(), [String]month.MonthNo() );
traverse( businessTypeList, Elements, businessType ) {
productCodeList := CapacityAndSaleBudgeChartRow::GetProductCodesByBusinessType( rows, businessType );
@@ -282,10 +282,10 @@
);
}
}
- info( "process month end : " + [String]month.MonthNo() );
+ debuginfo( "process month end : " + [String]month.MonthNo() );
}
}
- info( "process year end : " + [String]year.YearNo() )
+ debuginfo( "process year end : " + [String]year.YearNo() )
}
//info( "CapacityAndSaleBudgeChartElement : " + [String]selectset( this, CapacityAndSaleBudgeChartElement, item, true ).Size() );
//traverse( this, CapacityAndSaleBudgeChartRow, row ) {
--
Gitblit v1.9.3