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

lazhen

2024-08-27 6dd20e086c57bd0371d8633f6c3ae90c354a4067

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

 _Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_Export.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Export (
  MachineLogisticsCostReportRows mlcrrs
)
{
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def

@@ -54,20 +54,6 @@
        Taborder: 2
      ]
    }
    Component npPercentage
    {
      #keys: '[412672.0.1040102201]'
      BaseType: 'WebNumberPicker'
      Properties:
      [
        DataBinding: 'dhDialogData.Data.Percentage'
        Label: 'Percentage*'
        Max: '99'
        Min: '1'
        PlaceHolder: 'Percentage ä¸ºå¿…填项'
        Taborder: 3
      ]
    }
    Component efPercentage
    {
      #keys: '[414996.1.29740363]'
@@ -75,10 +61,11 @@
      Properties:
      [
        DataBinding: 'dhDialogData.Data.Percentage'
        Enabled: false
        Label: 'Final Percentage'
        Taborder: 4
        Tooltip: '最终输入的Percentage会在这里展示'
        Mask: 'REAL'
        PlaceHolder: 'Percentage ä¸ºå¿…填项'
        Taborder: 3
        Text: '0'
      ]
    }
  ]

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Method_OnOK.def

@@ -7,13 +7,12 @@
  [*
    if( isnull( dhDialogData.Data( ) )){
      if( ddlUnit.Visible() ){
        UphillRouting::Create( ddlUnit.Data(), dsStartDate.Date(),dsEndDate.Date(),npPercentage.Number() );
        UphillRouting::Create( ddlUnit.Data(), dsStartDate.Date(),dsEndDate.Date(),[Real]efPercentage.Text() );
      }else{
        UphillRouting::Create( dhRouting.Data(), dsStartDate.Date(),dsEndDate.Date(),npPercentage.Number());
        UphillRouting::Create( dhRouting.Data(), dsStartDate.Date(),dsEndDate.Date(),[Real]efPercentage.Text());
      } 
    }else{
      
    }
    info( npPercentage.Number() );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def

@@ -7,7 +7,17 @@
  GroupServerCalls: true
  Precondition:
  [*
    return dsStartDate.Date() < dsEndDate.Date();
    flag := true;
    if(([Real]efPercentage.Text()).IsNaN()){
      flag := false;
      feedback := "Percentage ä¸ºå¿…填项.";
    }
    if( dsStartDate.Date() >= dsEndDate.Date() ){
      flag := false;
      feedback := "结束日期必须在开始日期之后.";
    }
    
    return flag;
  *]
  QuillAction
  {

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnCreated.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlContent_npPercentage_OnUserChanged.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_ListUphillRouting#943.def

@@ -37,6 +37,7 @@
  ]
  Properties:
  [
    MinimumColumns: 3
    Taborder: 0
  ]
  ResponseDefinitions:

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Component_listContextMenuUphillRouting#1.def

@@ -5,7 +5,7 @@
  BaseType: 'listContextMenu'
  Children:
  [
    Component MenuCreate
    Component mCreate
    {
      #keys: '[412672.0.1043375746]'
      BaseType: 'WebMenu'
@@ -16,6 +16,17 @@
        Title: 'Create...'
      ]
    }
    Component mDelete id:mDelete_870
    {
      #keys: '[414996.1.33518326]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'DELETE'
        Taborder: 4
        Title: 'Delete'
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mCreate_OnClick.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_MenuCreate_OnClick.def ÐÞ¸Ä
@@ -1,12 +1,12 @@
Quintiq file version 2.0
#parent: ListUphillRouting_943
Response OnClick () id:Response_ListUphillRouting_943_MenuCreate_OnClick
Response OnClick () id:Response_ListUphillRouting_943_mCreate_OnClick
{
  #keys: '[412672.0.1040123392]'
  CanBindMultiple: false
  DefinitionID => /ListUphillRouting_943/Responsedef_ListUphillRouting_943_WebMenu_OnClick
  GroupServerCalls: true
  Initiator: 'MenuCreate'
  Initiator: 'mCreate'
  QuillAction
  {
    Body:

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRoutings/Response_ListUphillRouting_943_mDelete_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: ListUphillRouting_943
Response OnClick (
  structured[UphillRouting] selection
) id:Response_ListUphillRouting_943_mDelete_OnClick
{
  #keys: '[414996.1.33518513]'
  CanBindMultiple: false
  DefinitionID => /ListUphillRouting_943/Responsedef_ListUphillRouting_943_WebMenu_OnClick
  GroupServerCalls: true
  Initiator: 'mDelete'
  QuillAction
  {
    Body:
    [*
      if( WebMessageBox::Question( "确认删除？",Translations::MessageBox_YesNo() ) = 0 ){
        traverse( selection,Elements,element ){
          element.Delete(); 
        }
      }
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_pHeader.def

@@ -26,14 +26,13 @@
        Taborder: 1
      ]
    }
    Component Button655
    Component bExport
    {
      #keys: '[413988.0.1467011030]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'PIG'
        Label: 'Button655'
        Image: 'EXPORT1'
        Taborder: 2
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Response_pHeader_bExport_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
Quintiq file version 2.0
#parent: pHeader/bExport
Response OnClick () id:Response_pHeader_bExport_OnClick
{
  #keys: '[413988.0.1503619865]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      mlcrrs := selectset( MacroPlan, MachineLogisticsCostReportRow, tempMLCRR, true );
      
      MachineLogisticsCostReportCell::Export( mlcrrs );
    *]
    GroupServerCalls: false
  }
}