From f8f5f77c1504d85a9b87e69249f2309e42c6fa44 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 10 九月 2024 17:54:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
index b40e9e5..a380250 100644
--- a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
@@ -10,6 +10,8 @@
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 := '瀹㈡埛闇�姹�' );
@@ -19,8 +21,8 @@
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() ) );
--
Gitblit v1.9.3