Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/MDIBase.cs

@@ -727,6 +727,10 @@ namespace GcDevicePc
                             globaldata.show_MethodName = tmpname;
                             SetMainFormMethodName(tmpname);
                             globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, tmpname.ToString());
+
+                            if(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 2)
+                                globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, tmpname.ToString());
+
                             globaldata.m_profileMethod.SetMethodFullName(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName);
                             globaldata.m_profileMethod.GetDevInjPortAllPara();
                             globaldata.m_profileMethod.GetSampleAllPara("前进样器");
@@ -1658,6 +1662,7 @@ namespace GcDevicePc
             OpenFileDialog fileDlg = new OpenFileDialog();
             fileDlg.Multiselect = false;
             fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder;
+            fileDlg.RestoreDirectory = true;
             fileDlg.Title = "请选择方法文件";
             fileDlg.Filter = "配置文件(*.ini)|*.ini";
             if (fileDlg.ShowDialog() == DialogResult.OK)
@@ -1709,6 +1714,7 @@ namespace GcDevicePc
                 OpenFileDialog fileDlg = new OpenFileDialog();
                 fileDlg.Multiselect = false;
                 fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder;
+                fileDlg.RestoreDirectory = true;
                 fileDlg.Title = "请选择方法文件";
                 fileDlg.Filter = "配置文件(*.ini)|*.ini";
                 if (fileDlg.ShowDialog() == DialogResult.OK)

GcDevicePc/auxtool.cs

@@ -170,6 +170,7 @@ namespace GcDevicePc
             OpenFileDialog fileDlg = new OpenFileDialog();
             fileDlg.Multiselect = false;
             fileDlg.InitialDirectory = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.TmpFolder;
+            fileDlg.RestoreDirectory = true;
             fileDlg.Title = "请选择方法文件";
             fileDlg.Filter = "更新程序(*.*)|*.*";