xiaoding721
2024-05-23 961a746fb6f8c8d0ce1440aa411075c383865d38
需求导入优化
已添加7个文件
已修改4个文件
172 ■■■■■ 文件已修改
_Main/BL/Relations/Relation_RequirementImportExecutionStatus_Archive_Archive_RequirementImportE.qbl 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionRespMessage.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionStatus.qbl 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionUserName.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_RequirementImportExecutionStatus/_ROOT_Type_RequirementImportExecutionStatus.qbl 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated.def 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Relations/Relation_RequirementImportExecutionStatus_Archive_Archive_RequirementImportE.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation RequirementImportExecutionStatus_Archive_Archive_RequirementImportExecutionStatus
{
  #keys: '1[414996.0.382770175]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide Archive
  {
    #keys: '3[414996.0.382770177][414996.0.382770176][414996.0.382770178]'
    Cardinality: '0to1'
    ObjectDefinition: RequirementImportExecutionStatus
    OwningSide: 'Reference'
  }
  RelationSide.RightSide RequirementImportExecutionStatus
  {
    #keys: '3[414996.0.382770180][414996.0.382770179][414996.0.382770181]'
    Cardinality: '1toN'
    ObjectDefinition: Archive
    OwningSide: 'Owned'
  }
}
_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
@@ -27,17 +27,25 @@
    info( json );
    
    // è°ƒç”¨æŽ¥å£
    //url := "/PR/Import";
    //i := HTTPInterface::Create( archive.JavaInterfaceAddress(), archive.JavaInterfacePort() );
    //i.URL( url );
    //i.PostMethod( true );
    //
    //try {
    //  i.Call( json );
    //
    //  htmlresult := i.Result();
    //} onerror {
    //
    //}
    url := "/PR/Import";
    i := HTTPInterface::Create( archive.JavaInterfaceAddress(), archive.JavaInterfacePort() );
    i.URL( url );
    i.PostMethod( true );
    i.MediaType( "application/json" );
    i.Call( json );
    htmlresult := i.Result();
    respJSON   := JSON::Parse( htmlresult );
    code       := respJSON.Get( "code" ).GetNumber();
    message    := respJSON.Get( "message" ).GetString();
    if ( code = 200 ) {
    } else {
      error( message );
    }
  *]
}
_Main/BL/Type_Archive/StaticMethod_RequirementProcessing.qbl
@@ -27,8 +27,13 @@
    filePath := archive.FileArchivePath() + "\" + "temp" + "\";
    OS::CreateDirectory( filePath );
    
    // åˆ›å»ºæ‰§è¡ŒçŠ¶æ€
    archive.RequirementImportExecutionStatus( relnew,
                                              ExecutionStatus    := "InProgress",
                                              ExecutionUserName  := userName );
    if ( prBinaryValue.Size() > 0 ) {
      Archive::HandlePR( archive, macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath );
      archive -> Archive::HandlePR( macroPlan, userName, prFileName, prBinaryValue, isPRArchive, filePath );
    } else if ( ppBinaryValue.Size() > 0 ) {
      Archive::HandlePP( archive, macroPlan, userName, ppFileName, ppBinaryValue, isPPArchive, filePath );
    } else if ( budgetBinaryValue.Size() > 0 ) {
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionRespMessage.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute ExecutionRespMessage
{
  #keys: '3[414996.0.382770258][414996.0.382770257][414996.0.382770259]'
  ValueType: String
}
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionStatus.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
Quintiq file version 2.0
#parent: #root
Attribute ExecutionStatus
{
  #keys: '3[414996.0.382747512][414996.0.382747511][414996.0.382747513]'
  Description:
  [*
    InProgress   // æ‰§è¡Œä¸­
    Complete    // æ‰§è¡Œå®Œæˆ
  *]
  ValueType: String
}
_Main/BL/Type_RequirementImportExecutionStatus/Attribute_ExecutionUserName.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute ExecutionUserName
{
  #keys: '3[414996.0.382747367][414996.0.382747366][414996.0.382747368]'
  Description: '执行用户'
  ValueType: String
}
_Main/BL/Type_RequirementImportExecutionStatus/_ROOT_Type_RequirementImportExecutionStatus.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
Type RequirementImportExecutionStatus
{
  #keys: '5[414996.0.382770155][414996.0.382770153][0.0.0][414996.0.382770154][414996.0.382770156]'
  BaseType: Object
  StructuredName: 'RequirementImportExecutionStatuss'
}
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
@@ -31,6 +31,43 @@
        Taborder: 1
      ]
    }
    Component dhRequirementImportExecutionStatus
    {
      #keys: '[414996.0.387620344]'
      BaseType: 'WebDataHolder'
      Databinding: 'RequirementImportExecutionStatus'
      Children:
      [
        Component deRequirementImportExecutionStatus
        {
          #keys: '[414996.0.387620380]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'Archive'
            FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
            FixedFilter: 'object.ExecutionUserName() = userName'
            Source: 'Archive'
            Taborder: 0
            Transformation: 'RequirementImportExecutionStatus'
          ]
        }
      ]
      Properties:
      [
        Taborder: 2
      ]
    }
    Component dhUserName
    {
      #keys: '[414996.0.387620508]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 3
      ]
    }
  ]
  Properties:
  [
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecuti.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: abgRequirementPreprocessing/dhRequirementImportExecutionStatus
Response OnDataChanged () id:Response_MacroPlanner_abgRequirementPreprocessing_dhRequirementImportExecutionStatus_OnDataChanged
{
  #keys: '[414996.0.387621135]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
  QuillAction
  {
    Body:
    [*
      if ( not isnull( this.Data() ) ) {
      }
    *]
    GroupServerCalls: false
  }
}
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: abgRequirementPreprocessing/dhUserName
Response OnCreated () id:Response_MacroPlanner_abgRequirementPreprocessing_dhUserName_OnCreated
{
  #keys: '[414996.0.387620588]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      this.Data( ApplicationMacroPlanner.GetUserName() );
    *]
    GroupServerCalls: false
  }
}
_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Method_OnOK.def
@@ -6,7 +6,7 @@
  Body:
  [*
    Form.ApplyChanges();
    Archive::RequirementProcessing( Archive, MacroPlan, ApplicationMacroPlanner.GetUserName(), 
                                    efPR.Text()                                                                          , guard( dhBinaryDataPR.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ), cPR.Checked(),
                                    efPP.Text()                                                                          , guard( dhBinaryDataPP.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ), cPP.Checked(),
@@ -15,6 +15,7 @@
                                    efCurve.Text()                                                                       , guard( dhBinaryDataCurve.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ),
                                    efIDS.Text()                                                                         , guard( dhBinaryDataIDS.Data().AsBinaryValue(), BinaryValue::Construct( 0 ) ) );   
    
    Form.Close();
  *]
}