Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-08-07 4e81774a232b45a6a9df3dfd06893c481c83695d

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

 _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() );
    }
    

 _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();
    }
    //导入后处理数据

 _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() );
    }
    

 _Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultCCUnit.qbl

@@ -5,7 +5,7 @@
  TextBody:
  [*
    // ç”„兰鸽 Jun-28-2024 (created)
    return '长春';
    return '长春工厂';
    //return 'Assembly Plant (France)';
  *]
}

 _Main/BL/Type_FinancialWeeklyReport/StaticMethod_GetDefaultDLUnit.qbl

@@ -5,7 +5,7 @@
  TextBody:
  [*
    // ç”„兰鸽 Jun-28-2024 (created)
    return '大连';
    return '大连工厂';
    //return 'Assembly Plant (Spain)';
  *]
}

 _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:
  [

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews#859.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
      ]
    }
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman#968.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.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