From 4e81774a232b45a6a9df3dfd06893c481c83695d Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 07 八月 2024 15:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_FinancialProductionSource/Method_ReadStructure.qbl | 6 +++---
_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultCCUnit.qbl | 2 +-
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews#859.def | 14 --------------
_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultDLUnit.qbl | 2 +-
_Main/BL/Type_FinancialProductionReport/Method_ImportVerification.qbl | 10 ++++------
_Main/BL/Type_FinancialSalesReport/Method_ImportVerification.qbl | 6 +++---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def | 11 +++++++++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman#968.def | 6 +++---
8 files changed, 26 insertions(+), 31 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() );
}
diff --git a/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultCCUnit.qbl b/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultCCUnit.qbl
index 739a84b..7bf8369 100644
--- a/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultCCUnit.qbl
+++ b/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultCCUnit.qbl
@@ -5,7 +5,7 @@
TextBody:
[*
// 鐢勫叞楦� Jun-28-2024 (created)
- return '闀挎槬';
+ return '闀挎槬宸ュ巶';
//return 'Assembly Plant (France)';
*]
}
diff --git a/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultDLUnit.qbl b/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultDLUnit.qbl
index d544c74..781dc80 100644
--- a/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultDLUnit.qbl
+++ b/_Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultDLUnit.qbl
@@ -5,7 +5,7 @@
TextBody:
[*
// 鐢勫叞楦� Jun-28-2024 (created)
- return '澶ц繛';
+ return '澶ц繛宸ュ巶';
//return 'Assembly Plant (Spain)';
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def
index c424753..6a9f767 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def
@@ -93,6 +93,17 @@
Taborder: 7
]
}
+ Component ButtonScenarioComparisonDemandComparison id:ButtonScenarioComparisonDemandComparison_256
+ {
+ #keys: '[412672.1.90201789]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'EQUALS'
+ Label: '闇�姹傚姣�'
+ Taborder: 8
+ ]
+ }
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
index 062b204..f5f7736 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
@@ -1,18 +1,4 @@
Quintiq file version 2.0
Component ActionBarGroupScenarioComparisonViews #extension
{
- Children:
- [
- Component ButtonScenarioComparisonDemandComparison
- {
- #keys: '[412672.0.1090347286]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'EQUALS'
- Label: '闇�姹傚姣�'
- Taborder: 8
- ]
- }
- ]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.def "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman\043968.def"
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.def
rename to "_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman\043968.def"
index b8c7979..9f5a28e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman\043968.def"
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: ActionBarGroupScenarioComparisonViews/ButtonScenarioComparisonDemandComparison
-Response OnClick () id:Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioComparisonDemandComparison_OnClick
+#parent: ActionBarGroupReport/ButtonScenarioComparisonDemandComparison_256
+Response OnClick () id:Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioComparisonDemandComparison_OnClick_968
{
- #keys: '[412672.0.1090347405]'
+ #keys: '[412672.1.90201788]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
QuillAction
--
Gitblit v1.9.3