修复一些bug，调整页面布局

xiaoding721

2024-11-11 331f46d96ef1e2140042d3c2f7938fe0d9635c27

修复一些bug，调整页面布局

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
StaticMethod AsyncCreateFullTable (
  const Keys macroPlanMDSIDs,
  RecycleBin recycleBin,
  const Archive archive,
  const MacroPlan owner
)
{
  TextBody:
  [*
    // Akari Nov-11-2024 (created)
    AsyncFlag::Running( recycleBin,MP_Cell_ScheduleSummary::GetTableName() );
    
    macroPlans := stream[MacroPlan]::Success();
    traverse( macroPlanMDSIDs,Elements,mdsid ){
      streamMacroPlan := LocalTool::LoadMacroPlan( mdsid );
      macroPlans.Merge( streamMacroPlan );
    }
    
    macroPlans -> GroupAll() -> MP_Cell_ScheduleSummary::CreateFullTable( recycleBin,archive,owner );
  *]
}

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateTables.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
Quintiq file version 2.0
#parent: #root
StaticMethod AsyncCreateTables (
  const Keys macroPlanMDSIDs
)
{
  TextBody:
  [*
    // Akari Nov-11-2024 (created)
    traverse( macroPlanMDSIDs,Elements,mdsid ){
      streamMacroPlan := LocalTool::LoadMacroPlan( mdsid );
      streamMacroPlan -> MP_Cell_ScheduleSummary::Create( );
    }
  *]
}

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl

@@ -7,8 +7,7 @@
  TextBody:
  [*
      // rislai Aug-6-2024 (created)
    table := select( owner,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() );
    if( not isnull( table )){
    traverse( owner,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() ){
      table.Delete(); 
    }
    

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl

@@ -10,7 +10,7 @@
  TextBody:
  [*
    // rislai Aug-7-2024 (created)
    tables := MP_Table::GetMP_Tables_ScheduleSummary( owners );
    tables := selectset( owners,Elements.MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() );
    
    scheduleSummaryOutputDataIndexTree := NamedValueTree::Create();
    scheduleSummaryOutputDatas := selectset( archive,ScheduleSummaryOutputLine.ScheduleSummaryOutputData,data,
@@ -23,7 +23,11 @@
      scheduleSummaryOutputDataIndexTree.Root().AddChild( scheduleSummaryOutputDataHandle,i );
    }
    
    traverse( recycleBin,LocalTable,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() ){
      table.Delete();
    }
    localTable := recycleBin.LocalTable( relnew,Name := MP_Cell_ScheduleSummary::GetTableName() );
    
    startDate := minselect( tables,Elements.MP_Column,column,column.CustomDate() ).CustomDate();
    endDate := maxselect( tables,Elements.MP_Column,column,column.CustomDate() ).CustomDate();
    
@@ -146,7 +150,7 @@
    //  columnIndexTree.Root().AddChild( columnHandle,columns.Size() - 1 );
    //}
    
    
    AsyncFlag::Success( recycleBin,MP_Cell_ScheduleSummary::GetTableName() );
    return localTable;
  *]
}

 _Main/BL/Type_LocalTable/Attribute_CreateTime.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute CreateTime
{
  #keys: '3[414996.1.213514774][414996.1.213514773][414996.1.213514775]'
  ValueType: DateTime
}

 _Main/BL/Type_LocalTable/_ROOT_Type_LocalTable.qbl

@@ -5,5 +5,6 @@
{
  #keys: '5[412672.0.1084249615][412672.0.1084249613][0.0.0][412672.0.1084249614][412672.0.1084249616]'
  BaseType: Object
  OnCreate: 'this.CreateTime( DateTime::Now() );'
  StructuredName: 'LocalTables'
}

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl

@@ -7,8 +7,7 @@
  TextBody:
  [*
    // rislai Aug-6-2024 (created)
    table := select( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() );
    if( not isnull( table )){
    traverse( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() ){
      table.Delete(); 
    }
    

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl

@@ -11,7 +11,11 @@
    // rislai Aug-7-2024 (created)
    tables := selectset( owners,Elements.MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName());
    
    traverse( recycleBin,LocalTable,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() ){
      table.Delete();
    }
    localTable := recycleBin.LocalTable( relnew,Name := MP_Cell_AnnualPlanReport::GetTableName() );
    
    startDate := minselect( tables,Elements.MP_Column,column,column.CustomDate() ).CustomDate();
    endDate := maxselect( tables,Elements.MP_Column,column,column.CustomDate() ).CustomDate();
    

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateTables.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/Attribute_CreateTime.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute CreateTime
{
  #keys: '3[414996.1.213444720][414996.1.213444719][414996.1.213444721]'
  ValueType: DateTime
}

 _Main/BL/Type_MP_Table/StaticMethod_CreateMP_Tables_ScheduleSummary.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/_ROOT_Type_MP_Table.qbl

@@ -5,5 +5,6 @@
{
  #keys: '5[412672.1.95254778][412672.1.95254776][0.0.0][412672.1.95254777][412672.1.95254779]'
  BaseType: Object
  OnCreate: 'this.CreateTime( DateTime::Now() );'
  StructuredName: 'MP_Tables'
}

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def

@@ -18,7 +18,7 @@
          Properties:
          [
            DataType: 'LocalTable'
            Source: 'dhComparisonData'
            Source: 'dhAnnualPlanTable'
            Taborder: 0
            Transformation: 'LocalRow.LocalCell.astype(LocalCell_Default)'
          ]
@@ -47,7 +47,7 @@
            DataType: 'LocalTable'
            FilterArguments: 'checkedProducts:QMacroPlanner::FormAnnualPlanReport.dhFinelProducts;checkedEntitys:QMacroPlanner::FormAnnualPlanReport.dhFinelEntitys'
            FixedFilter: 'exists( checkedProducts,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedEntitys,Elements,entity,entity.DisplayName() = object.ProductionLine())'
            Source: 'dhComparisonData'
            Source: 'dhAnnualPlanTable'
            Taborder: 0
            Transformation: 'LocalRow'
          ]
@@ -75,7 +75,7 @@
            DataType: 'LocalTable'
            FilterArguments: 'startDate:QMacroPlanner::FormAnnualPlanReport.dhStartDate;endDate:QMacroPlanner::FormAnnualPlanReport.dhEndDate;timeUnit:QMacroPlanner::FormAnnualPlanReport.dhTimeUnit'
            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() and object.TimeUnit() = timeUnit'
            Source: 'dhComparisonData'
            Source: 'dhAnnualPlanTable'
            Taborder: 0
            Transformation: 'LocalColumn'
          ]

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pAnnualPlanReport#439.def

@@ -40,14 +40,14 @@
        Taborder: 2
      ]
    }
    Component dhComparisonData
    Component dhAnnualPlanTable
    {
      #keys: '[414996.1.209190961]'
      BaseType: 'WebDataHolder'
      Databinding: 'LocalTable'
      Children:
      [
        Component deComparisonData
        Component deAnnualPlanTable
        {
          #keys: '[414996.1.209190962]'
          BaseType: 'WebDataExtractor'

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhAnnualPlanTable_OnDataChanged.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged.def ÐÞ¸Ä
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: pAnnualPlanReport_439/dhComparisonData
Response OnDataChanged () id:Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged
#parent: pAnnualPlanReport_439/dhAnnualPlanTable
Response OnDataChanged () id:Response_pAnnualPlanReport_439_dhAnnualPlanTable_OnDataChanged
{
  #keys: '[414996.1.209190954]'
  CanBindMultiple: false

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def

@@ -9,8 +9,8 @@
  {
    Body:
    [*
      rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProducts.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine())); 
      columns := selectset( dhComparisonData.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
      rows := selectset( dhAnnualPlanTable.Data(),LocalRow,row,exists( dhFinelProducts.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine())); 
      columns := selectset( dhAnnualPlanTable.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
      LocalCell_Default::AsyncExport( RecycleBin,rows,columns );
      //Application.Download( "产出导入模板.xlsx",data.AsBinaryData() );
    *]

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_MatrixEditor510.def

@@ -18,7 +18,7 @@
          Properties:
          [
            DataType: 'LocalTable'
            Source: 'dhTable'
            Source: 'dhScheduleSummaryTable'
            Taborder: 0
            Transformation: 'LocalRow.LocalCell.astype(LocalCell_ScheduleSummary)'
          ]
@@ -47,7 +47,7 @@
            DataType: 'LocalTable'
            FilterArguments: 'checkedEntitys:QMacroPlanner::FormScheduleSummaryReport.dhFinelEntitys'
            FixedFilter: 'exists( checkedEntitys,Elements,entity,entity.DisplayName() = object.Name() )'
            Source: 'dhTable'
            Source: 'dhScheduleSummaryTable'
            Taborder: 0
            Transformation: 'LocalRow'
          ]
@@ -75,7 +75,7 @@
            DataType: 'LocalTable'
            FilterArguments: 'startDate:QMacroPlanner::FormScheduleSummaryReport.dhStartDate;endDate:QMacroPlanner::FormScheduleSummaryReport.dhEndDate'
            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() '
            Source: 'dhTable'
            Source: 'dhScheduleSummaryTable'
            Taborder: 0
            Transformation: 'LocalColumn'
          ]

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pRibbonDown#478.def

@@ -27,6 +27,43 @@
        Taborder: 1
      ]
    }
    Component dhAsyncFlag
    {
      #keys: '[414996.1.214519511]'
      BaseType: 'WebDataHolder'
      Databinding: 'AsyncFlag'
      Children:
      [
        Component deAsyncFlag
        {
          #keys: '[414996.1.214519512]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'RecycleBin'
            FixedFilter: 'object.Name() = MP_Cell_ScheduleSummary::GetTableName()'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'AsyncFlag'
          ]
        }
      ]
      Properties:
      [
        Taborder: 3
      ]
    }
    Component lAsyncFlag id:lAsyncFlag_19
    {
      #keys: '[414996.1.214519535]'
      BaseType: 'WebLabel'
      Properties:
      [
        DataBinding: 'dhAsyncFlag.Data.State'
        Label: '运行状态:'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pScheduleSummary.def

@@ -41,11 +41,27 @@
      ]
    }
    #child: MatrixEditor
    Component dhTable
    Component dhScheduleSummaryTable
    {
      #keys: '[412672.1.96380914]'
      BaseType: 'WebDataHolder'
      Databinding: 'LocalTable'
      Children:
      [
        Component deScheduleSummaryTable
        {
          #keys: '[414996.1.214519458]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'RecycleBin'
            FixedFilter: 'object.Name() = MP_Cell_ScheduleSummary::GetTableName()'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'LocalTable'
          ]
        }
      ]
      Properties:
      [
        Taborder: 1

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pExport_bExport_OnClick#832.def

@@ -9,8 +9,8 @@
  {
    Body:
    [*
      rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.Name() ));
      columns := selectset( dhTable.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() );
      rows := selectset( dhScheduleSummaryTable.Data(),LocalRow,row,exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.Name() ));
      columns := selectset( dhScheduleSummaryTable.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() );
      attrbutes := construct( Strings );
      if( cbShiftPlan.Checked() ){
        attrbutes.Add( "ShiftPattern" ); 

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def

@@ -41,7 +41,7 @@
      macroPlans := ApplicationMacroPlanner.GetLoadedMacroPlans();
      table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
      
      dhTable.Data( table );
      dhScheduleSummaryTable.Data( table );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_dhAsyncFlag_OnDataChanged.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
Quintiq file version 2.0
#parent: pRibbonDown_478/dhAsyncFlag
Response OnDataChanged () id:Response_pRibbonDown_dhAsyncFlag_OnDataChanged
{
  #keys: '[414996.1.214519509]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
  GroupServerCalls: true
  QuillAction
  {
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonUp_88_bCreateBaseData_OnClick#88.def

@@ -9,8 +9,8 @@
  {
    Body:
    [*
      MP_Table::CreateMP_Tables_ScheduleSummary( ApplicationMacroPlanner.GetLoadedMacroPlans() );
      WebMessageBox::Success( "Success" );
      macroPlanMDSIDs := ApplicationMacroPlanner.GetMacroPlanMDSIDsByName( "计划汇总" );
      MP_Cell_ScheduleSummary::AsyncCreateTables( macroPlanMDSIDs );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonUp_88_bCreateFullTable_OnClick#71.def

@@ -9,12 +9,9 @@
  {
    Body:
    [*
      macroPlans := ApplicationMacroPlanner.GetLoadedMacroPlans();
      table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
      macroPlanMDSIDs := ApplicationMacroPlanner.GetMacroPlanMDSIDsByName( "计划汇总" );
      
      dhTable.Data( table );
      
      WebMessageBox::Success( "Success" );
      MP_Cell_ScheduleSummary::AsyncCreateFullTable( macroPlanMDSIDs,RecycleBin,Archive, MacroPlan );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pScheduleSummary_dhScheduleSummaryTable_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
Quintiq file version 2.0
#parent: pScheduleSummary/dhScheduleSummaryTable
Response OnCreated () id:Response_pScheduleSummary_dhScheduleSummaryTable_OnCreated
{
  #keys: '[412672.1.96380911]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  GroupServerCalls: true
  QuillAction
  {
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pScheduleSummary_dhScheduleSummaryTable_OnDataChanged#906.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pScheduleSummary_dhTable_OnDataChanged#906.def ÐÞ¸Ä
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: pScheduleSummary/dhTable
Response OnDataChanged () id:Response_pScheduleSummary_dhTable_OnDataChanged_906
#parent: pScheduleSummary/dhScheduleSummaryTable
Response OnDataChanged () id:Response_pScheduleSummary_dhScheduleSummaryTable_OnDataChanged_906
{
  #keys: '[412672.1.99700929]'
  CanBindMultiple: false

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pScheduleSummary_dhTable_OnCreated.def

ÎļþÒÑɾ³ý