删除一些不必要的代码，添加发布存档数据功能（全年计划报表和计划汇总报表）

xiaoding721

2024-11-14 7e778ef1beff527e71cc2db99c914ce2330f1edd

删除一些不必要的代码，添加发布存档数据功能（全年计划报表和计划汇总报表）

 _Main/BL/Relations/Relation_MP_Column_MP_Cell_MP_Cell_MP_Column.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Relations/Relation_MP_Row_MP_Cell_MP_Cell_MP_Row.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Relations/Relation_MP_Table_MP_Column_MP_Column_MP_Table.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Relations/Relation_MP_Table_MP_Row_MP_Row_MP_Table.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Relations/Relation_MP_Table_MacroPlan_MacroPlan_MP_Table.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_Default/StaticMethod_AsyncExport.qbl

@@ -24,6 +24,6 @@
      columnstring := columnstring.Merge( cellxml);
    }
    
    columnstring -> GroupAll() -> ExportXMLManager::AwaitLocalTableXMLData( recycleBin,guard( rows.Element(0).LocalTable().Name(),MP_Cell_AnnualPlanReport::GetTableName()) );
    columnstring -> GroupAll() -> ExportXMLManager::AwaitLocalTableXMLData( recycleBin,guard( rows.Element(0).LocalTable().Name(),ArchiveCell_AnnualPlanReport::GetTableName()) );
  *]
}

 _Main/BL/Type_LocalCell_ScheduleSummary#859/StaticMethod_AsyncExport.qbl

@@ -27,6 +27,6 @@
      columnstring := columnstring.Merge( cellxml);
    }
    
    columnstring -> GroupAll() -> ExportXMLManager::AwaitLocalTableXMLData( recycleBin,guard( rows.Element(0).LocalTable().Name(),MP_Cell_ScheduleSummary::GetTableName()) );
    columnstring -> GroupAll() -> ExportXMLManager::AwaitLocalTableXMLData( recycleBin,guard( rows.Element(0).LocalTable().Name(),ArchiveCell_ScheduleSummary::GetTableName()) );
  *]
}

 _Main/BL/Type_LocalCell_ScheduleSummary/Attribute_Capacity.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/Attribute_IsFristWeekData.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/Attribute_Output.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/Attribute_ShiftPattern.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/Attribute_WorkingDay.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateTables.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_ExportOutputTemplate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_GetTableName.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_ImportOutput.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalCell_ScheduleSummary/_ROOT_Type_MP_Cell_ScheduleSummary.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LocalColumn/Function_CalcDisplayDate.qbl

ÎļþÃû´Ó _Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl ÐÞ¸Ä
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
Function CalcWeekDate
Function CalcDisplayDate
{
  TextBody:
  [*
@@ -15,7 +15,7 @@
      us_locale := Locale::Construct( 'en_us' );
      
      date := this.CustomDate();
      stringDate := date.Format( "Y: MM / M" + "月" ,us_locale )
      stringDate := date.Format( "MM / M" + "月" ,us_locale )
      value := stringDate;
    }else{
      value := this.CustomDate().Format( "Y/M2/D2" );

 _Main/BL/Type_MP_Cell/_ROOT_Type_MP_Cell.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/Attribute_NewSupply.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateTables.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_GetTableName.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport/_ROOT_Type_MP_Cell_AnnualPlanReport.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Cell_AnnualPlanReport0/StaticMethod_CreateFullTable.qbl

@@ -14,8 +14,6 @@
    }
    localTable := recycleBin.LocalTable( relnew,Name := ArchiveCell_AnnualPlanReport::GetTableName() );
    
    info( "111" );
    
    tables := selectset( archive,ArchiveTable,table,table.Name() = ArchiveCell_AnnualPlanReport::GetTableName());
    
    startDate := minselect( tables,Elements.ArchiveColumn,column,column.CustomDate() ).CustomDate();

 _Main/BL/Type_MP_Cell_ScheduleSummary0/StaticMethod_Create.qbl

@@ -58,7 +58,7 @@
          
          
          if( not isnull( workHours )){
            capacity := workDay * throughput * workHours.Capacity().HoursAsReal()
            capacity := workDay * throughput //* workHours.Capacity().HoursAsReal()
          }
          
          isFirstWeekData := true;

 _Main/BL/Type_MP_Cell_ScheduleSummary0/StaticMethod_CreateFullTable.qbl

@@ -10,7 +10,7 @@
  [*
    // rislai Aug-7-2024 (created)
    tables := selectset( archive,ArchiveTable,table,table.Name() = ArchiveCell_ScheduleSummary::GetTableName() );
    info( isnull( archive ))
    
    scheduleSummaryOutputDataIndexTree := NamedValueTree::Create();
    scheduleSummaryOutputDatas := selectset( archive,ScheduleSummaryOutputLine.ScheduleSummaryOutputData,data,
                                             exists( tables,Elements.ArchiveRow,row,row.CustomName() = data.ScheduleSummaryOutputLine().LineName() ));

 _Main/BL/Type_MP_Column/Attribute_CustomDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Attribute_CustomIndex.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Attribute_Date.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Attribute_Index.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Attribute_IsAttrbuteColumn.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Attribute_Name.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/DefaultValue_CustomIndex.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/DefaultValue_Name.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Function_CalcDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/Function_CalcIndex.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Column/_ROOT_Type_MP_Column.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_CustomName.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_Index.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_Name.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_ProductID.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_ProductionLine.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_Remark.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Attribute_StockingPointID.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/DefaultValue_CustomName.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/DefaultValue_Name.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/DefaultValue_Remark.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/Function_CalcName.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Row/_ROOT_Type_MP_Row.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/Attribute_CreateTime.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/Attribute_Name.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/Attribute_RowIndexCache.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/DefaultValue_Name.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/Method_GetRowIndexCache.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_MP_Table/_ROOT_Type_MP_Table.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl

@@ -8,9 +8,5 @@
  [*
    // Akari Nov-12-2024 (created)
    info( macroPlan.MDSMacroPlan().Description() );
    
    traverse( macroPlan,MP_Table,table ){
      info( table.Name() ); 
    }
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def

@@ -14,9 +14,13 @@
      }
      if( cbOfflinePlan.Checked() ){
        plannames.Add( lblOfflinePlan.Label() );
        
        ArchiveCell_AnnualPlanReport::Create( MacroPlan,Archive );
      }
      if( cbShiftPlan.Checked() ){
        plannames.Add( lblShiftPlan.Label() );
        
        ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
      }
      if( cbAssembleOnlinePlan.Checked() ){
        plannames.Add( lblAssembleOnlinePlan.Label() );
@@ -36,6 +40,7 @@
                                                , currentuser );
      }
    
    
    this.Close();
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pRibbonUp.def

@@ -5,17 +5,6 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component bCreateBaseData
    {
      #keys: '[414996.1.230731110]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'C_CLAMP'
        Label: 'Create base data'
        Taborder: 0
      ]
    }
    Component bCreateFullTable
    {
      #keys: '[414996.1.230731111]'
@@ -24,7 +13,7 @@
      [
        Image: 'C_CLAMP'
        Label: 'Create full table'
        Taborder: 1
        Taborder: 0
      ]
    }
    Component rbgTimeUnit
@@ -37,7 +26,7 @@
        ButtonLabels: 'Day;Week;Month'
        ButtonValues: 'Day;Week;Month'
        Orientation: 'horizontal'
        Taborder: 2
        Taborder: 1
      ]
    }
    Component dhTimeUnit
@@ -47,7 +36,7 @@
      Databinding: 'String*'
      Properties:
      [
        Taborder: 3
        Taborder: 2
      ]
    }
  ]

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateBaseData_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def

@@ -44,6 +44,6 @@
  ]
  Properties:
  [
    Taborder: 10
    Taborder: 9
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pRibbon.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_PanelRibbon.def ÐÞ¸Ä
@@ -1,5 +1,5 @@
Quintiq file version 2.0
Component PanelRibbon
Component pRibbon
{
  #keys: '[412672.1.94122014]'
  BaseType: 'WebPanel'

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

@@ -14,7 +14,7 @@
        Checked: true
        Description: '班次'
        Label: '班次'
        Taborder: 2
        Taborder: 1
      ]
    }
    Component cbWorkday
@@ -26,7 +26,7 @@
        Checked: true
        Description: '工作日'
        Label: '工作日'
        Taborder: 3
        Taborder: 2
      ]
    }
    Component cbCapacity
@@ -38,7 +38,7 @@
        Checked: true
        Description: '产能'
        Label: '产能'
        Taborder: 4
        Taborder: 3
      ]
    }
    Component cbOutput
@@ -50,7 +50,7 @@
        Checked: true
        Description: '产量'
        Label: '产量'
        Taborder: 5
        Taborder: 4
      ]
    }
    Component dsStartDate id:dsStartDate_438
@@ -60,7 +60,7 @@
      Properties:
      [
        Label: 'Start Date'
        Taborder: 6
        Taborder: 5
      ]
    }
    Component dhStartDate id:dhStartDate_891
@@ -70,7 +70,7 @@
      Databinding: 'Date*'
      Properties:
      [
        Taborder: 7
        Taborder: 6
      ]
    }
    Component dsEndDate id:dsEndDate_963
@@ -81,7 +81,7 @@
      [
        Date: 9999-12-31
        Label: 'End Date'
        Taborder: 8
        Taborder: 7
      ]
    }
    Component dhEndDate id:dhEndDate_384
@@ -91,7 +91,7 @@
      Databinding: 'Date*'
      Properties:
      [
        Taborder: 9
        Taborder: 8
      ]
    }
    Component bCreateFullTable
@@ -102,17 +102,6 @@
      [
        Image: 'C_CLAMP'
        Label: 'Create full table'
        Taborder: 1
      ]
    }
    Component bCreateBaseData
    {
      #keys: '[414996.1.104721297]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'C_CLAMP'
        Label: 'Create base data'
        Taborder: 0
      ]
    }

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

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/_ROOT_Component_FormScheduleSummaryReport.def

@@ -7,7 +7,7 @@
  BaseType: 'WebForm'
  Children:
  [
    #child: PanelRibbon
    #child: pRibbon
    #child: pScheduleSummary
  ]
  Properties: