SVN-Revision: r399
This commit is contained in:
wyf
2025-03-26 10:45:36 +00:00
parent 124dae6e45
commit 1cd1ad3c2e
2 changed files with 306 additions and 73 deletions
+44 -16
View File
@@ -101,26 +101,54 @@ namespace Lskj.PubBomImport
{
try
{
FolderBrowserDialog dialog = new FolderBrowserDialog();
dialog.Description = "选择导入文件夹";
DialogResult dialogResult = dialog.ShowDialog();
if (dialogResult == DialogResult.OK)
if (Model.ShowType.Equals("1"))
{
string dirPath = dialog.SelectedPath;
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.ImportTimer.Tick += (ts, te) =>
FolderBrowserDialog dialog = new FolderBrowserDialog();
dialog.Description = "选择导入文件夹";
DialogResult dialogResult = dialog.ShowDialog();
if (dialogResult == DialogResult.OK)
{
frmProgress.ImportTimer.Enabled = false;
frmProgress.StartImport(dirPath);
};
frmProgress.ImportTimer.Enabled = true;
frmProgress.ShowDialog();
frmProgress.Dispose();
string dirPath = dialog.SelectedPath;
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.ImportTimer.Tick += (ts, te) =>
{
frmProgress.ImportTimer.Enabled = false;
frmProgress.StartImportInDir(dirPath);
};
frmProgress.ImportTimer.Enabled = true;
frmProgress.ShowDialog();
frmProgress.Dispose();
}
else
{
this.Close();
}
}
else
else if (Model.ShowType.Equals("2"))
{
this.Close();
OpenFileDialog dialog = new OpenFileDialog();
dialog.Title = "选择导入文件";
dialog.Filter = "Excel文件(*.xlsx)|*.xlsx|Excel文件(*.xls)|*.xls";
DialogResult dialogResult = dialog.ShowDialog();
if (dialogResult == DialogResult.OK)
{
string dirPath = dialog.FileName;
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.ImportTimer.Tick += (ts, te) =>
{
frmProgress.ImportTimer.Enabled = false;
frmProgress.StartImportInMxFile(dirPath);
};
frmProgress.ImportTimer.Enabled = true;
frmProgress.ShowDialog();
frmProgress.Dispose();
}
else
{
this.Close();
}
}
}
catch (Exception ex)