SVN-Revision: r539
This commit is contained in:
wyf
2025-05-07 08:40:13 +00:00
parent 4bbdcfb69a
commit ffa65eec12
3 changed files with 639 additions and 265 deletions
+139 -120
View File
@@ -80,7 +80,7 @@ namespace Lskj.PubBomImport
InitGridColumns();
InitMulitControl();
InitDataSource();
if (showTypeValue == 0 || showTypeValue == 3 || showTypeValue == 5 || showTypeValue == 55 || (showTypeValue > 0 && showType))
if (showTypeValue == 0 || showTypeValue == 3 || showTypeValue == 4 || showTypeValue == 5 || showTypeValue == 55 || (showTypeValue > 0 && showType))
{
OnBtnImportClick(null, null);
}
@@ -160,60 +160,120 @@ namespace Lskj.PubBomImport
this.Close();
}
}
else if (Model.ShowType.Equals("1"))
{
FolderBrowserDialog dialog = new FolderBrowserDialog();
dialog.SelectedPath = Properties.Settings.Default.LastSelectFolder;
dialog.Description = "选择导入文件夹";
DialogResult dialogResult = dialog.ShowDialog();
if (dialogResult == DialogResult.OK)
{
Properties.Settings.Default.LastSelectFolder = dialog.SelectedPath;
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 if (Model.ShowType.Equals("2"))
{
OpenFileDialog dialog = new OpenFileDialog();
dialog.InitialDirectory = Properties.Settings.Default.LastSelectFolder;
dialog.Title = "选择导入文件";
dialog.Filter = "Excel文件(*.xlsx)|*.xlsx|Excel文件(*.xls)|*.xls";
DialogResult dialogResult = dialog.ShowDialog();
if (dialogResult == DialogResult.OK)
{
Properties.Settings.Default.LastSelectFolder = Path.GetDirectoryName(dialog.FileName);
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();
}
}
else if (Model.ShowType.Equals("3"))//新增多个清单文件
//else if (Model.ShowType.Equals("1"))
//{
// FolderBrowserDialog dialog = new FolderBrowserDialog();
// dialog.SelectedPath = Properties.Settings.Default.LastSelectFolder;
// dialog.Description = "选择导入文件夹";
// DialogResult dialogResult = dialog.ShowDialog();
// if (dialogResult == DialogResult.OK)
// {
// Properties.Settings.Default.LastSelectFolder = dialog.SelectedPath;
// 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 if (Model.ShowType.Equals("2"))
//{
// OpenFileDialog dialog = new OpenFileDialog();
// dialog.InitialDirectory = Properties.Settings.Default.LastSelectFolder;
// dialog.Title = "选择导入文件";
// dialog.Filter = "Excel文件(*.xlsx)|*.xlsx|Excel文件(*.xls)|*.xls";
// DialogResult dialogResult = dialog.ShowDialog();
// if (dialogResult == DialogResult.OK)
// {
// Properties.Settings.Default.LastSelectFolder = Path.GetDirectoryName(dialog.FileName);
// 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();
// }
//}
//else if (Model.ShowType.Equals("3"))//新增多个清单文件
//{
// BomImpRtnModel bomImpRtnModel = new BomImpRtnModel()
// {
// ShowType = Model.ShowType,
// AfterBomFieldName = Model.AfterBomFieldName,
// CanSave = true
// };
// FormDialogModel dialogModel = new FormDialogModel()
// {
// DialogDllName = "Lskj.PubBomImport.dll",
// PubDialogType = DialogType.PubAddRecord,
// ReturnTag = bomImpRtnModel
// };
// this.Tag = dialogModel;
// DataTable sourceTable = StaticControl.RightMenuGridView.GridControl.DataSourceTable();
// if (sourceTable.Columns.Contains("BomFieldNameDir"))
// {
// List<DataRow> selectRows = new List<DataRow>();
// foreach (DataRow sourceRow in sourceTable.Rows)
// {
// if (sourceRow.RowState == DataRowState.Deleted)
// {
// continue;
// }
// string fileName = sourceRow[Model.AfterBomFieldName] + "";
// string dirPath = sourceRow["BomFieldNameDir"] + "";
// FileInfo parentInfo = null;
// if (string.IsNullOrEmpty(dirPath))
// {
// continue;
// }
// parentInfo = new FileInfo(dirPath);
// selectRows.Add(sourceRow);
// }
// if (selectRows.Count > 0)
// {
// FrmProgress frmProgress = new FrmProgress();
// frmProgress.frmMain = this;
// frmProgress.Model = Model;
// frmProgress.ImportTimer.Tick += (ts, te) =>
// {
// frmProgress.ImportTimer.Enabled = false;
// frmProgress.StartImportInQDFile(selectRows);
// };
// frmProgress.ImportTimer.Enabled = true;
// DialogResult dialogResult = frmProgress.ShowDialog();
// bomImpRtnModel.CanSave = dialogResult == DialogResult.OK;
// frmProgress.Dispose();
// }
// else
// {
// this.Close();
// }
// }
// else
// {
// this.Close();
// }
//}
else if (Model.ShowType.Equals("4"))//新增或修改单个清单文件
{
BomImpRtnModel bomImpRtnModel = new BomImpRtnModel()
{
@@ -228,75 +288,34 @@ namespace Lskj.PubBomImport
ReturnTag = bomImpRtnModel
};
this.Tag = dialogModel;
DataTable sourceTable = StaticControl.RightMenuGridView.GridControl.DataSourceTable();
if (sourceTable.Columns.Contains("BomFieldNameDir"))
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.Model = Model;
frmProgress.ImportTimer.Tick += (ts, te) =>
{
List<DataRow> selectRows = new List<DataRow>();
foreach (DataRow sourceRow in sourceTable.Rows)
{
if (sourceRow.RowState == DataRowState.Deleted)
{
continue;
}
string fileName = sourceRow[Model.AfterBomFieldName] + "";
string dirPath = sourceRow["BomFieldNameDir"] + "";
FileInfo parentInfo = null;
if (string.IsNullOrEmpty(dirPath))
{
continue;
}
parentInfo = new FileInfo(dirPath);
selectRows.Add(sourceRow);
}
if (selectRows.Count > 0)
{
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.Model = Model;
frmProgress.ImportTimer.Tick += (ts, te) =>
{
frmProgress.ImportTimer.Enabled = false;
frmProgress.StartImportInQDFile(selectRows);
};
frmProgress.ImportTimer.Enabled = true;
DialogResult dialogResult = frmProgress.ShowDialog();
bomImpRtnModel.CanSave = dialogResult == DialogResult.OK;
frmProgress.Dispose();
}
else
{
this.Close();
}
}
else
{
this.Close();
}
frmProgress.ImportTimer.Enabled = false;
frmProgress.StartImportInQDFile();
};
frmProgress.ImportTimer.Enabled = true;
DialogResult dialogResult = frmProgress.ShowDialog();
bomImpRtnModel.CanSave = dialogResult == DialogResult.OK;
frmProgress.Dispose();
}
else if (Model.ShowType.Equals("4"))//新增或修改单个清单文件
else if (Model.ShowType.Equals("44"))//通过已经上传的数据来解析并且建立BOM
{
OpenFileDialog dialog = new OpenFileDialog();
dialog.Title = "选择导入文件";
dialog.Filter = "Excel文件(*.xlsx)|*.xlsx|Excel文件(*.xls)|*.xls";
DialogResult dialogResult = dialog.ShowDialog();
if (dialogResult == DialogResult.OK)
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.Model = Model;
frmProgress.ImportTimer.Tick += (ts, te) =>
{
string dirPath = dialog.FileName;
FrmProgress frmProgress = new FrmProgress();
frmProgress.frmMain = this;
frmProgress.ImportTimer.Tick += (ts, te) =>
{
frmProgress.ImportTimer.Enabled = false;
frmProgress.StartImportInQDFile(dirPath);
};
frmProgress.ImportTimer.Enabled = true;
frmProgress.ShowDialog();
frmProgress.Dispose();
}
else
{
this.Close();
}
frmProgress.ImportTimer.Enabled = false;
string billDocument = Model.MaintabFocusedRow != null && Model.MaintabFocusedRow.Table.Columns.Contains("qms_wjgg_billdocument_id") ? Model.MaintabFocusedRow["qms_wjgg_billdocument_id"] + "" : "";
frmProgress.StartExecBomUpdate(billDocument);
};
frmProgress.ImportTimer.Enabled = true;
frmProgress.ShowDialog();
frmProgress.Dispose();
}
else if (Model.ShowType.Equals("5"))//通过文件名进行文件上传和逻辑记录
{