Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
| | |
| | | monthperiodname := monthstart.Format( "M2/D2/Y" ); |
| | | enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date(); |
| | | this.Column( relnew, Name := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() ); |
| | | weekstart := monthstart.StartOfNextMonth(); |
| | | monthstart := monthstart.StartOfNextMonth(); |
| | | } |
| | | } |
| | | *] |
| | |
| | | TextBody: |
| | | [* |
| | | // 甄兰鸽 Aug-20-2024 (created) |
| | | macroplan.CustomerDemandIDS( relflush ); |
| | | macroplan.CustomerDemandIDSSearch( relflush ); |
| | | allunit := CustomerDemandIDS::GetDefaultAllUnit(); |
| | | macroplan.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit ); |
| | | idstable := macroplan.CustomerDemandIDS( relnew, ID := '客户需求', Name := '客户需求' ); |
| | |
| | | Transaction::Transaction().Propagate( attribute( GeneralExcelImportAndExportDataColumn, ColumnIndex ) ); |
| | | cnv2 := StringToDate::StandardConverter(); |
| | | cnv2.SetCustomConversion(); |
| | | cnv2.CustomFormatString( "dd/MM/yyyy" ); |
| | | idsdates := selectuniquevalues( source, GeneralExcelImportAndExportDataTable.GeneralExcelImportAndExportDataColumn, column, cnv2.Convert( column.Name() ) ); |
| | | cnv2.CustomFormatString( "yyyy/MM/dd" ); |
| | | idsdates := selectuniquevalues( source, GeneralExcelImportAndExportDataTable.GeneralExcelImportAndExportDataColumn, column, column.ColumnIndex() > 2, cnv2.Convert( column.Name() ) ); |
| | | ppadates := construct( Dates ); |
| | | traverse( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA' ){ |
| | | ppadates := ppadates.Union( selectuniquevalues( forecast, PlanningSalesDemandInPeriod, salesdemand, salesdemand.StartDate() ) ); |