xiaoding721
2024-10-26 ad92b664d0a336e605611e3f8b2cb16a8d1c01ee
修复周度表的表头改成KW01 + 周末日期
已重命名2个文件
已添加4个文件
已修改3个文件
已删除2个文件
113 ■■■■■ 文件已修改
_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor#127.def 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison#1.def 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison234#1.def 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison#1.def 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison527#1.def 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl
对比新文件
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute WeekDate
{
  #keys: '3[414996.1.170054736][414996.1.170054735][414996.1.170054737]'
  ValueType: String
}
_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
对比新文件
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: #root
Function CalcWeekDate
{
  TextBody:
  [*
    // Akari Oct-26-2024 (created)
    value := "";
    if( this.TimeUnit() = "Week" ){
      date := this.CustomDate().StartOfNextWeek() - 1 ;
      stringDate := date.Format( "Y/M2/D2");
      perSuffx := ifexpr( this.CustomDate().Week() < 10,"0"+[String]this.CustomDate().Week(),[String]this.CustomDate().Week() );
      value := "KW" + perSuffx + " - " + stringDate;
    }else{
      value := this.CustomDate().Format( "Y/M2/D2" );
    }
    this.WeekDate( value );
  *]
}
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor#127.def
文件名从 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510#127.def 修改
@@ -1,24 +1,24 @@
Quintiq file version 2.0
Component MatrixEditor510 id:MatrixEditor510_127
Component MatrixEditor id:MatrixEditor_127
{
  #keys: '[412672.1.106503696]'
  BaseType: 'WebMatrixEditor'
  Children:
  [
    Component MatrixEditorCell294
    Component MatrixEditorCell
    {
      #keys: '[412672.1.106503697]'
      BaseType: 'WebMatrixEditorCell'
      Children:
      [
        Component DataExtractorCells611
        Component DataExtractorCells
        {
          #keys: '[412672.1.106503698]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'LocalTable'
            Source: 'dhComparisonData854'
            Source: 'dhComparisonData'
            Taborder: 0
            Transformation: 'LocalRow.LocalCell.astype(LocalCell_Default)'
          ]
@@ -32,13 +32,13 @@
        Taborder: 0
      ]
    }
    Component MatrixEditorRows221
    Component MatrixEditorRows
    {
      #keys: '[412672.1.106503699]'
      BaseType: 'WebMatrixEditorHeaderLevel'
      Children:
      [
        Component DataExtractorRows116
        Component DataExtractorRows
        {
          #keys: '[412672.1.106503700]'
          BaseType: 'WebDataExtractor'
@@ -47,7 +47,7 @@
            DataType: 'LocalTable'
            FilterArguments: 'checkedProduct:QMacroPlanner::FormAnnualPlanReport.dhFinelProduct;checkedEntitys:QMacroPlanner::FormAnnualPlanReport.dhFinelEntitys'
            FixedFilter: 'exists( checkedProduct,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedEntitys,Elements,entity,entity.DisplayName() = object.ProductionLine())'
            Source: 'dhComparisonData854'
            Source: 'dhComparisonData'
            Taborder: 0
            Transformation: 'LocalRow'
          ]
@@ -60,13 +60,13 @@
        Taborder: 1
      ]
    }
    Component MatrixEditorColumns391
    Component MatrixEditorColumns
    {
      #keys: '[412672.1.106503701]'
      BaseType: 'WebMatrixEditorHeaderLevel'
      Children:
      [
        Component DataExtractorColumns655
        Component DataExtractorColumns
        {
          #keys: '[412672.1.106503702]'
          BaseType: 'WebDataExtractor'
@@ -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: 'dhComparisonData854'
            Source: 'dhComparisonData'
            Taborder: 0
            Transformation: 'LocalColumn'
          ]
@@ -83,20 +83,20 @@
      ]
      Properties:
      [
        Legend: 'Date'
        Legend: 'WeekDate'
        SortCriteria: 'Index'
        Taborder: 2
      ]
    }
    #child: matrixEditorActionBarPageDemandComparison234_1
    #child: matrixeditorContextMenuDemandComparison527_1
    #child: matrixEditorActionBarPageDemandComparison_1
    #child: matrixeditorContextMenuDemandComparison_1
  ]
  Properties:
  [
    AllowMultipleAttributes: true
    Columns: 'MatrixEditorColumns391'
    ContextMenu: 'matrixeditorContextMenuDemandComparison527'
    Rows: 'MatrixEditorRows221'
    Columns: 'MatrixEditorColumns'
    ContextMenu: 'matrixeditorContextMenuDemandComparison'
    Rows: 'MatrixEditorRows'
    Taborder: 0
  ]
}
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
@@ -40,7 +40,7 @@
        Taborder: 2
      ]
    }
    Component dhComparisonData854
    Component dhComparisonData
    {
      #keys: '[412672.1.106503705]'
      BaseType: 'WebDataHolder'
@@ -50,7 +50,7 @@
        Taborder: 1
      ]
    }
    #child: MatrixEditor510_127
    #child: MatrixEditor_127
    Component dhCheckedEntitys
    {
      #keys: '[412672.1.107978890]'
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison#1.def
对比新文件
@@ -0,0 +1,10 @@
Quintiq file version 2.0
Component matrixEditorActionBarPageDemandComparison id:matrixEditorActionBarPageDemandComparison_1
{
  #keys: '[412672.1.106503703]'
  BaseType: 'matrixEditorActionBarPage'
  Properties:
  [
    Taborder: 3
  ]
}
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison234#1.def
文件已删除
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison#1.def
对比新文件
@@ -0,0 +1,10 @@
Quintiq file version 2.0
Component matrixeditorContextMenuDemandComparison id:matrixeditorContextMenuDemandComparison_1
{
  #keys: '[412672.1.106503704]'
  BaseType: 'matrixeditorContextMenu'
  Properties:
  [
    Taborder: 4
  ]
}
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison527#1.def
文件已删除
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def
文件名从 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData854_OnDataChanged.def 修改
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: PanelAnnualPlan/dhComparisonData854
Response OnDataChanged () id:Response_PanelAnnualPlan_dhComparisonData854_OnDataChanged
#parent: PanelAnnualPlan/dhComparisonData
Response OnDataChanged () id:Response_PanelAnnualPlan_dhComparisonData_OnDataChanged
{
  #keys: '[412672.1.106503673]'
  CanBindMultiple: false
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def
@@ -10,7 +10,7 @@
    Body:
    [*
      table := MP_Cell_AnnualPlanReport::CreateFullTable( ApplicationMacroPlanner.GetMacroPlans(),RecycleBin,MacroPlan );
      dhComparisonData854.Data( table );
      dhComparisonData.Data( table );
      
      WebMessageBox::Success( "Success" );
    *]
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def
@@ -9,8 +9,8 @@
  {
    Body:
    [*
      rows := selectset( dhComparisonData854.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine()));
      columns := selectset( dhComparisonData854.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
      rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProduct.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());
      LocalCell_Default::AsyncExport( RecycleBin,rows,columns );
      //Application.Download( "浜у嚭瀵煎叆妯℃澘.xlsx",data.AsBinaryData() );
    *]