Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-11-14 6fee2172fd423dcc612fdc2b398806dab4f841f6

Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

# Conflicts:
#	_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def

 _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_DialogCreateLockPeriod/Component_pProduct#661.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent661.def ÐÞ¸Ä
@@ -1,27 +1,27 @@
Quintiq file version 2.0
Component pnlContent661
Component pProduct
{
  #keys: '[414996.1.206961946]'
  BaseType: 'WebPanel'
  Children:
  [
    Component ddlProductInStockingPoint
    Component ddlProduct
    {
      #keys: '[414996.1.206961947]'
      BaseType: 'WebDropDownList'
      Databinding: 'ProductInStockingPoint_MP'
      Databinding: 'Product_MP'
      Children:
      [
        Component deContent404
        Component deProduct
        {
          #keys: '[414996.1.206961948]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'StockingPoint_MP'
            Source: 'dhSelectStockingPoint'
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'ProductInStockingPoint_MP'
            Transformation: 'Product_MP'
          ]
        }
      ]
@@ -33,7 +33,7 @@
        Taborder: 0
      ]
    }
    Component cbAllProductInStockingPoint
    Component cbAllProduct
    {
      #keys: '[414996.1.206961949]'
      BaseType: 'WebCheckbox'
@@ -47,6 +47,6 @@
  [
    FixedSize: true
    Orientation: 'horizontal'
    Taborder: 2
    Taborder: 1
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def

@@ -12,7 +12,7 @@
      Databinding: 'StockingPoint_MP'
      Children:
      [
        Component deContent
        Component deStockingPoint
        {
          #keys: '[414996.1.206961944]'
          BaseType: 'WebDataExtractor'

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def

@@ -12,21 +12,11 @@
      Properties:
      [
        Label: '锁定期至：'
        Taborder: 3
        Taborder: 2
      ]
    }
    #child: pStockingPoint
    #child: pnlContent661
    Component dhSelectStockingPoint
    {
      #keys: '[414996.1.206961950]'
      BaseType: 'WebDataHolder'
      Databinding: 'StockingPoint_MP'
      Properties:
      [
        Taborder: 1
      ]
    }
    #child: pProduct
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: pProduct/cbAllProduct
Response OnChanged () id:Response_pProduct_cbAllProduct_OnChanged
{
  #keys: '[414996.1.206961937]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      if( this.Checked() ){
        ddlProduct.Enabled( false,"" ); 
      }else{
        ddlProduct.Enabled( true,"" );
      }
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_ddlProductInStockingPoint_OnSelectionChanged.def ÐÞ¸Ä
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: pnlContent661/ddlProductInStockingPoint
#parent: pProduct/ddlProduct
Response OnSelectionChanged (
  ProductInStockingPoint_MP selection
) id:Response_pnlContent661_ddlProductInStockingPoint_OnSelectionChanged
) id:Response_pProduct_ddlProduct_OnSelectionChanged
{
  #keys: '[414996.1.207063206]'
  CanBindMultiple: false

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def

@@ -10,7 +10,7 @@
    Body:
    [*
      if( cbAllStockingPoint.Checked() ){
        if( cbAllProductInStockingPoint.Checked() ){
        if( cbAllProduct.Checked() ){
          // é”å®šå…¨éƒ¨äº§å“
          traverse( MacroPlan,Product_MP,product ){
            traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
@@ -19,13 +19,13 @@
          }
        }else{
          // é”å®šæŒ‡å®šäº§å“ä¸‹çš„全部库存点
          product := ddlProductInStockingPoint.Data().Product_MP();
          product := ddlProduct.Data();
          traverse( product,ProductInStockingPoint_MP,productInStockingPoint){
            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
          }
        }
      }else{
        if( cbAllProductInStockingPoint.Checked() ){
        if( cbAllProduct.Checked() ){
          // é”å®šæŒ‡å®šåº“存点下的全部产品
          stockingPoint := ddlStockingPoint.Data();
          traverse( stockingPoint,ProductInStockingPoint_MP,productInStockingPoint ){
@@ -33,7 +33,10 @@
          }
        }else{
          // é”å®šæŒ‡å®šåº“存点的指定产品
          LockPeriod::Create( ddlProductInStockingPoint.Data(),dsLockDate.Date() );
          productInStockingPoint := select( ddlProduct.Data(),ProductInStockingPoint_MP,pisp,pisp.StockingPoint_MP() = ddlStockingPoint.Data() );
          if( not isnull( productInStockingPoint )){
            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
          }
        } 
      }
      Form.Close();

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_cbAllProductInStockingPoint_OnChanged.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def

@@ -18,15 +18,19 @@
    }
    if( cbOfflinePlan.Checked() ){
      dlplannames.Add( lblOfflinePlan.Label() );
      ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
    }
    if( cbOfflinePlanCC.Checked() ){
      ccplannames.Add( lblOfflinePlanCC.Label() );
      ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
    }
    if( cbShiftPlan.Checked() ){
      dlplannames.Add( lblShiftPlan.Label() );
      ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
    }
    if( cbShiftPlanCC.Checked() ){
      ccplannames.Add( lblShiftPlanCC.Label() );
      ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
    }
    if( cbAssembleOnlinePlan.Checked() ){
      dlplannames.Add( lblAssembleOnlinePlan.Label() );

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport#94.def

@@ -29,7 +29,7 @@
          Properties:
          [
            DataType: 'RecycleBin'
            FixedFilter: 'object.Name() = MP_Cell_AnnualPlanReport::GetTableName()'
            FixedFilter: 'object.Name() = ArchiveCell_AnnualPlanReport::GetTableName()'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'ExportXMLManager'

 _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_pExport_94_dhXMLDataListener_OnDataChanged.def

@@ -11,7 +11,7 @@
    [*
      if( not isnull( this.Data() )){
        binaryValue := dhXMLDataListener.Data( ).Export();
        Application.Download( MP_Cell_AnnualPlanReport::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
        Application.Download( ArchiveCell_AnnualPlanReport::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
        dhXMLDataListener.Data( ).Delete();
      }
    *]

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pRibbonUp_bCreateBaseData_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_pExport.def

@@ -29,7 +29,7 @@
          Properties:
          [
            DataType: 'RecycleBin'
            FixedFilter: 'object.Name() = MP_Cell_ScheduleSummary::GetTableName()'
            FixedFilter: 'object.Name() = ArchiveCell_ScheduleSummary::GetTableName()'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'ExportXMLManager'
@@ -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_pExport_dhXMLDataListener_OnDataChanged#141.def

@@ -11,7 +11,7 @@
    [*
      if( not isnull( this.Data() )){
        binaryValue := dhXMLDataListener.Data( ).Export();
        Application.Download( MP_Cell_ScheduleSummary::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
        Application.Download( ArchiveCell_ScheduleSummary::GetTableName() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
        dhXMLDataListener.Data( ).Delete();
      }
    *]

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bExportTemplate_OnClick.def

@@ -9,7 +9,7 @@
  {
    Body:
    [*
      data := MP_Cell_ScheduleSummary::ExportOutputTemplate( Date::ActualDate().Year() );
      data := ArchiveCell_ScheduleSummary::ExportOutputTemplate( Date::ActualDate().Year() );
      
      Application.Download( "产出导入模板.xlsx",data.AsBinaryData() );
    *]

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def

@@ -27,7 +27,7 @@
          generalExcelImportAndExportDataSource := GeneralExcelImportAndExportDataSource::Upload( RecycleBin, webFileBinaryData, fileName );
          generalExcelImportAndExportDataSource.ReadStructure();
          
          MP_Cell_ScheduleSummary::ImportOutput( Archive,generalExcelImportAndExportDataSource);
          ArchiveCell_ScheduleSummary::ImportOutput( Archive,generalExcelImportAndExportDataSource);
          
          // åŽç»­åˆ é™¤
          generalExcelImportAndExportDataSource.Delete();
@@ -39,7 +39,7 @@
      }
      
      macroPlans := ApplicationMacroPlanner.GetLoadedMacroPlans();
      table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
      table := ArchiveCell_ScheduleSummary::CreateFullTable( Archive ,RecycleBin, MacroPlan );
      
      dhScheduleSummaryTable.Data( table );
    *]

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