From d8d3bd970c502e077d390e9d3f05fd311bf50d6b Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期二, 06 八月 2024 14:06:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_FinancialProductionSource/Method_ReadStructure.qbl | 6 +++---
_Main/BL/Type_FinancialProductionReport/Method_ImportVerification.qbl | 10 ++++------
_Main/BL/Type_FinancialSalesReport/Method_ImportVerification.qbl | 6 +++---
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/_Main/BL/Type_FinancialProductionReport/Method_ImportVerification.qbl b/_Main/BL/Type_FinancialProductionReport/Method_ImportVerification.qbl
index 55ea3ee..f7b6a58 100644
--- a/_Main/BL/Type_FinancialProductionReport/Method_ImportVerification.qbl
+++ b/_Main/BL/Type_FinancialProductionReport/Method_ImportVerification.qbl
@@ -27,11 +27,9 @@
error( Translations::MP_FinancialProductionReport_ImportIndetifyIllegalTime() );
}
period := cnv2.Convert( indexcolumn.Name() );
- // info( "寮�濮嬫椂闂达細", this.SalesForecastInputSource().PlanningStartDate().Format( "Y-M2-D2" ),
- // "缁撴潫鏃堕棿锛�", this.SalesForecastInputSource().PlanningEndDate().Format( "Y-M2-D2" ),
- // "鍒楁椂闂达細", cnv2.Convert( indexColumn.name() ).Format( "Y-M2-D2" ) );
+
// 鍒ゆ柇鏄惁鍦ㄨ鍒掑懆鏈熷唴
- if ( period <= startofthisyear or period >= startofnextyear ) {
+ if ( period < startofthisyear or period > startofnextyear ) {
error( Translations::MP_FinancialProductionReport_ImportIndetifyOverPeriod() );
}
indexcolumn := indexcolumn.NextColumn();
@@ -42,8 +40,8 @@
unitcolumn := selectobject( this, FinancialProductionColumn, column, column.Index() = 1 );
units := selectuniquevalues( unitcolumn, FinancialProductionCell, cell, cell.Value() );
- if( units.Size() <> 2 or ( units.Find( FinancialProductionReport::GetDefaultCCUnit() ) >= 0
- and units.Find( FinancialProductionReport::GetDefaultDLUnit() ) >= 0 ) ){
+ if( units.Size() > 2 or ( units.Find( FinancialProductionReport::GetDefaultCCUnit() ) < 0
+ and units.Find( FinancialProductionReport::GetDefaultDLUnit() ) < 0 ) ){
error( Translations::MP_FinancialProductionReport_ImportIndetifyFactoryNoExist() );
}
diff --git a/_Main/BL/Type_FinancialProductionSource/Method_ReadStructure.qbl b/_Main/BL/Type_FinancialProductionSource/Method_ReadStructure.qbl
index 44f9498..e4409b5 100644
--- a/_Main/BL/Type_FinancialProductionSource/Method_ReadStructure.qbl
+++ b/_Main/BL/Type_FinancialProductionSource/Method_ReadStructure.qbl
@@ -16,9 +16,9 @@
FinancialProductionReport::XMLImportFinancialProductionReportXMLHeaders( tableXML );
xlstable := FinancialProductionReport::XMLImportFinancialProductionReportXML( tableXML );
-
+
xlstable.SyncRows();
-
+
xlstable.Name( sheetName );
xlstable.IsImport( true );
this.FinancialProductionReport( relinsert, &xlstable );
@@ -27,7 +27,7 @@
// 锛堝鍏ュ墠锛夌粰绌哄�艰祴浜堥粯璁ゅ�硷紙N/A锛�,骞朵笖鍒犻櫎绌鸿鏁版嵁鍜屾暟鎹牎楠�
xlstable.IdentifyNullValues();
-
+
xlstable.ImportVerification();
}
//瀵煎叆鍚庡鐞嗘暟鎹�
diff --git a/_Main/BL/Type_FinancialSalesReport/Method_ImportVerification.qbl b/_Main/BL/Type_FinancialSalesReport/Method_ImportVerification.qbl
index 73d9cf9..b39339e 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_ImportVerification.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_ImportVerification.qbl
@@ -31,7 +31,7 @@
// "缁撴潫鏃堕棿锛�", this.SalesForecastInputSource().PlanningEndDate().Format( "Y-M2-D2" ),
// "鍒楁椂闂达細", cnv2.Convert( indexColumn.name() ).Format( "Y-M2-D2" ) );
// 鍒ゆ柇鏄惁鍦ㄨ鍒掑懆鏈熷唴
- if ( period <= startofthisyear or period >= startofnextyear ) {
+ if ( period < startofthisyear or period > startofnextyear ) {
error( Translations::MP_FinancialProductionReport_ImportIndetifyOverPeriod() );
}
indexcolumn := indexcolumn.NextColumn();
@@ -42,8 +42,8 @@
unitcolumn := selectobject( this, FinancialSalesColumn, column, column.Index() = 1 );
units := selectuniquevalues( unitcolumn, FinancialSalesCell, cell, cell.Value() );
- if( units.Size() <> 2 or ( units.Find( FinancialProductionReport::GetDefaultCCUnit() ) >= 0
- and units.Find( FinancialProductionReport::GetDefaultDLUnit() ) >= 0 ) ){
+ if( units.Size() > 2 or ( units.Find( FinancialSalesReport::GetDefaultCCUnit() ) < 0
+ and units.Find( FinancialSalesReport::GetDefaultDLUnit() ) < 0 ) ){
error( Translations::MP_FinancialProductionReport_ImportIndetifyFactoryNoExist() );
}
--
Gitblit v1.9.3