xiaoding721
2024-09-04 9ee4859010d71856ff97a3fb87f2aae1b6ae48f1
修复需求对比的一些bug
已添加4个文件
已修改9个文件
160 ■■■■■ 文件已修改
_Main/BL/Type_ArchiveBudget/Method_Filter.qbl 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePP/Method_Filter.qbl 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_Test/StaticMethod_Test.qbl 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarPageReport_dhDateUnitBudget_OnCreated.def 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarPageReport_dhDateUnitPP_OnCreated.def 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_dhBaseVersionPP_OnDataChanged.def 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchiveBudget/Method_Filter.qbl
对比新文件
@@ -0,0 +1,13 @@
Quintiq file version 2.0
#parent: #root
Method Filter (
  const ArchiveBudget baseVersion,
  String dateUnit
) const declarative remote as Boolean
{
  TextBody:
  [*
    // Akari Sep-4-2024 (created)
    return this <> baseVersion and this.Name().LikeUserLocale( dateUnit );
  *]
}
_Main/BL/Type_ArchivePP/Method_Filter.qbl
对比新文件
@@ -0,0 +1,13 @@
Quintiq file version 2.0
#parent: #root
Method Filter (
  const ArchivePP baseVersion,
  String dateUnit
) const declarative remote as Boolean
{
  TextBody:
  [*
    // Akari Sep-4-2024 (created)
    return this <> baseVersion and this.Name().LikeUserLocale( dateUnit );
  *]
}
_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
@@ -105,14 +105,6 @@
             workingDay := workingDay + cell.WorkingDay();
             capacity := capacity + cell.Capacity();
             
    //         shiftPatternHanlde := shiftPatternCount.GetHandle( cell.ShiftPattern() );
    //         shiftPatternCountValue := guard( shiftPatternCount.Root().Child( shiftPatternHanlde ),null( NamedValue ));
    //         if( isnull( shiftPatternCountValue )){
    //           shiftPatternCount.Root().AddChild( shiftPatternHanlde,1 );
    //         }else{
    //           shiftPatternCountValue.SetValue( shiftPatternCountValue.GetValueAsNumber() + 1 );
    //         }
             if( maxShiftPattern <> cell.ShiftPattern() ){
               if( maxShiftPatternCount = 0 ){
                  maxShiftPattern := cell.ShiftPattern();
_Main/BL/Type_Test/StaticMethod_Test.qbl
@@ -10,29 +10,21 @@
{
  TextBody:
  [*
    //name := "2020/04/01";
    //names := name.Tokenize( "/" );
    //  info( guard( Date::Construct( [Number]names.Element( 0 ),[Number]names.Element( 1 ),[Number]names.Element( 2 )),Date::MinDate() ));
    archive.ArchivePP( relflush );
    archive.ArchiveBudget( relflush );
    
    //traverse( archive,ScheduleSummaryOutputLine,line ){
    //  info( line.LineName() );
    //  traverse( line,ScheduleSummaryOutputData,data ){
    //    info( data.Date().Format( "Y-M2-D2 ") + " ->" + [String]data.Output() );
    //  }
    //}
    archive.ArchivePP( relnew,Name := "2025 M" )
    archive.ArchivePP( relnew,Name := "2025 W" )
    archive.ArchivePP( relnew,Name := "2026 M" )
    archive.ArchivePP( relnew,Name := "2026 W" )
    archive.ArchivePP( relnew,Name := "2027 M" )
    archive.ArchivePP( relnew,Name := "2027 W" )
    
    //table := select( macroPlan,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() );
    //if( not isnull( table )){
    //  table.Delete();
    //}
    archiveExecutionStatus.RequirementImportExecutionStatus( relnew,
                                                             ExecutionCode        := 500,
                                                             ExecutionIsSuccess   := false,
                                                             ExecutionRespMessage := "11111",
                                                             ExecutionStatus      := "Complete",
                                                             ExecutionUserName    := "vwedadmin" );
    archive.ArchiveBudget( relnew,Name := "2025 M" )
    archive.ArchiveBudget( relnew,Name := "2025 W" )
    archive.ArchiveBudget( relnew,Name := "2026 M" )
    archive.ArchiveBudget( relnew,Name := "2026 W" )
    archive.ArchiveBudget( relnew,Name := "2027 M" )
    archive.ArchiveBudget( relnew,Name := "2027 W" )
  *]
}
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def
@@ -6,6 +6,26 @@
  Children:
  [
    #child: ActionBarGroupReport
    Component dhDateUnitPP
    {
      #keys: '[414996.1.62800785]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 1
      ]
    }
    Component dhDateUnitBudget
    {
      #keys: '[414996.1.63951151]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 2
      ]
    }
  ]
  Properties:
  [
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarPageReport_dhDateUnitBudget_OnCreated.def
对比新文件
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ActionBarPageReport/dhDateUnitBudget
Response OnCreated () id:Response_MacroPlanner_ActionBarPageReport_dhDateUnitBudget_OnCreated
{
  #keys: '[414996.1.63951149]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      this.Data( "M" );
    *]
  }
}
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarPageReport_dhDateUnitPP_OnCreated.def
对比新文件
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ActionBarPageReport/dhDateUnitPP
Response OnCreated () id:Response_MacroPlanner_ActionBarPageReport_dhDateUnitPP_OnCreated
{
  #keys: '[414996.1.64299345]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      this.Data( "M" );
    *]
  }
}
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def
@@ -12,16 +12,6 @@
    #child: pSelectionCurve
    #child: pSelectionPP
    #child: PanelSelectionChecks
    Component dhDateUnit
    {
      #keys: '[414996.1.58048570]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 7
      ]
    }
  ]
  Properties:
  [
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def
@@ -57,8 +57,8 @@
          Properties:
          [
            DataType: 'Archive'
            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionBudget;dateUnit:QMacroPlanner::FormDemandComparison.dhDateUnit'
            FixedFilter: 'object <> baseSelection and object.Name().LikeUserLocale( dateUnit )'
            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionBudget;dateUnit:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhDateUnitBudget'
            FixedFilter: 'object.Filter( baseSelection,dateUnit )'
            Source: 'Archive'
            Taborder: 0
            Transformation: 'ArchiveBudget'
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
@@ -57,8 +57,8 @@
          Properties:
          [
            DataType: 'Archive'
            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPP;dateUnit:QMacroPlanner::FormDemandComparison.dhDateUnit'
            FixedFilter: 'object <> baseSelection and object.Name().LikeUserLocale( dateUnit )'
            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPP;dateUnit:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhDateUnitPP'
            FixedFilter: 'object.Filter( baseSelection,dateUnit )'
            Source: 'Archive'
            Taborder: 0
            Transformation: 'ArchivePP'
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
@@ -10,10 +10,12 @@
  {
    Body:
    [*
      if( this.Name().LikeUserLocale( "M" )){
        dhDateUnit.Data( "M" );
      if( not isnull( this.Data())){
        if( this.Data().Name().LikeUserLocale( "M" )){
          dhDateUnitBudget.Data( "M" );
      }else{
        dhDateUnit.Data( "W" );
          dhDateUnitBudget.Data( "W" );
        }
      }
    *]
  }
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def
@@ -4,7 +4,7 @@
  ArchivePP selection
) id:Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged
{
  #keys: '[412672.0.1109211873]'
  #keys: '[414996.1.62811858]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_dhBaseVersionPP_OnDataChanged.def
@@ -5,16 +5,18 @@
  #keys: '[414996.1.55350834]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      if( this.Name().LikeUserLocale( "M" )){
        dhDateUnit.Data( "M" );
      if( not isnull( this.Data())){
        if( this.Data().Name().LikeUserLocale( "M" )){
          dhDateUnitPP.Data( "M" );
      }else{
        dhDateUnit.Data( "W" );
          dhDateUnitPP.Data( "W" );
        }
      }
    *]
    GroupServerCalls: false
  }
}