From 11e66e438e5affbba0a7cdb258fbad1ab54a7dd8 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 10 九月 2024 10:46:19 +0800
Subject: [PATCH] 客户需去报表生成数据bug
---
_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
index b40e9e5..1024f76 100644
--- a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
@@ -19,8 +19,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