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

lazhen

2024-05-24 8e6b4fbf0ced25ea7bed8fc8fa8364bb104d05c2

 _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();
  *]
}