SVN r687
SVN-Revision: r687
This commit is contained in:
@@ -2804,6 +2804,8 @@ namespace Lskj.PubBill
|
|||||||
MessageUtil.Show($"文件分类必填");
|
MessageUtil.Show($"文件分类必填");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
ControlModel fileIDControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("文件ID")).FirstOrDefault();
|
||||||
|
string fileID = ControlObj.GetControlValue(fileIDControlModel);
|
||||||
ControlModel oldPIDControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("旧编码")).FirstOrDefault();
|
ControlModel oldPIDControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("旧编码")).FirstOrDefault();
|
||||||
string oldPID = ControlObj.GetControlValue(oldPIDControlModel);
|
string oldPID = ControlObj.GetControlValue(oldPIDControlModel);
|
||||||
DataTable sourceTable = gcMain.gridControl.DataSourceTable();
|
DataTable sourceTable = gcMain.gridControl.DataSourceTable();
|
||||||
@@ -2819,6 +2821,10 @@ namespace Lskj.PubBill
|
|||||||
{
|
{
|
||||||
sourceTable.Columns.Add("BomFieldNameDir");
|
sourceTable.Columns.Add("BomFieldNameDir");
|
||||||
}
|
}
|
||||||
|
if (!sourceTable.Columns.Contains("BomFieldNamePath"))
|
||||||
|
{
|
||||||
|
sourceTable.Columns.Add("BomFieldNamePath");
|
||||||
|
}
|
||||||
if (!sourceTable.Columns.Contains("BomMxMainProduct"))
|
if (!sourceTable.Columns.Contains("BomMxMainProduct"))
|
||||||
{
|
{
|
||||||
sourceTable.Columns.Add("BomMxMainProduct");
|
sourceTable.Columns.Add("BomMxMainProduct");
|
||||||
@@ -2835,6 +2841,10 @@ namespace Lskj.PubBill
|
|||||||
{
|
{
|
||||||
sourceTable.Columns.Add("BomAddSpeciesNo");
|
sourceTable.Columns.Add("BomAddSpeciesNo");
|
||||||
}
|
}
|
||||||
|
if (!sourceTable.Columns.Contains("BomAddChangeFileId"))
|
||||||
|
{
|
||||||
|
sourceTable.Columns.Add("BomAddChangeFileId");
|
||||||
|
}
|
||||||
if (!sourceTable.Columns.Contains("BomAddOldProductId"))
|
if (!sourceTable.Columns.Contains("BomAddOldProductId"))
|
||||||
{
|
{
|
||||||
sourceTable.Columns.Add("BomAddOldProductId");
|
sourceTable.Columns.Add("BomAddOldProductId");
|
||||||
@@ -2842,10 +2852,12 @@ namespace Lskj.PubBill
|
|||||||
DataTable dataTable = new DataTable();
|
DataTable dataTable = new DataTable();
|
||||||
dataTable.Columns.Add(afterBomFieldName);
|
dataTable.Columns.Add(afterBomFieldName);
|
||||||
dataTable.Columns.Add("BomFieldNameDir");
|
dataTable.Columns.Add("BomFieldNameDir");
|
||||||
|
dataTable.Columns.Add("BomFieldNamePath");
|
||||||
dataTable.Columns.Add("BomMxMainProduct");
|
dataTable.Columns.Add("BomMxMainProduct");
|
||||||
dataTable.Columns.Add("BomMxAddState");
|
dataTable.Columns.Add("BomMxAddState");
|
||||||
dataTable.Columns.Add("qms_laddf_mode");
|
dataTable.Columns.Add("qms_laddf_mode");
|
||||||
dataTable.Columns.Add("BomAddSpeciesNo");
|
dataTable.Columns.Add("BomAddSpeciesNo");
|
||||||
|
dataTable.Columns.Add("BomAddChangeFileId");
|
||||||
dataTable.Columns.Add("BomAddOldProductId");
|
dataTable.Columns.Add("BomAddOldProductId");
|
||||||
IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
|
IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
|
||||||
var mxRows = rowsIEnumerable.Where(n => (n[afterBomFieldName] + "").Trim().StartsWith("MX"));
|
var mxRows = rowsIEnumerable.Where(n => (n[afterBomFieldName] + "").Trim().StartsWith("MX"));
|
||||||
@@ -2874,9 +2886,11 @@ namespace Lskj.PubBill
|
|||||||
DataRow addRow = dataTable.NewRow();
|
DataRow addRow = dataTable.NewRow();
|
||||||
addRow[afterBomFieldName] = fileNameWithoutExtension;
|
addRow[afterBomFieldName] = fileNameWithoutExtension;
|
||||||
addRow["BomFieldNameDir"] = fileName;
|
addRow["BomFieldNameDir"] = fileName;
|
||||||
|
addRow["BomFieldNamePath"] = Path.GetFileName(fileName);
|
||||||
addRow["BomMxMainProduct"] = mxProductId;
|
addRow["BomMxMainProduct"] = mxProductId;
|
||||||
addRow["qms_laddf_mode"] = addMode;
|
addRow["qms_laddf_mode"] = addMode;
|
||||||
addRow["BomAddSpeciesNo"] = sepciesNo;
|
addRow["BomAddSpeciesNo"] = sepciesNo;
|
||||||
|
addRow["BomAddChangeFileId"] = fileID;
|
||||||
addRow["BomAddOldProductId"] = oldPID;
|
addRow["BomAddOldProductId"] = oldPID;
|
||||||
if (fileNameWithoutExtension.StartsWith("MX"))
|
if (fileNameWithoutExtension.StartsWith("MX"))
|
||||||
{
|
{
|
||||||
@@ -2888,10 +2902,12 @@ namespace Lskj.PubBill
|
|||||||
{
|
{
|
||||||
DataRow sourceRow = this.AddRowToGridView(item, true);
|
DataRow sourceRow = this.AddRowToGridView(item, true);
|
||||||
sourceRow["BomFieldNameDir"] = item["BomFieldNameDir"] + "";
|
sourceRow["BomFieldNameDir"] = item["BomFieldNameDir"] + "";
|
||||||
|
sourceRow["BomFieldNamePath"] = item["BomFieldNamePath"] + "";
|
||||||
sourceRow["BomMxMainProduct"] = item["BomMxMainProduct"] + "";
|
sourceRow["BomMxMainProduct"] = item["BomMxMainProduct"] + "";
|
||||||
sourceRow["BomMxAddState"] = item["BomMxAddState"] + "";
|
sourceRow["BomMxAddState"] = item["BomMxAddState"] + "";
|
||||||
sourceRow["qms_laddf_mode"] = item["qms_laddf_mode"] + "";
|
sourceRow["qms_laddf_mode"] = item["qms_laddf_mode"] + "";
|
||||||
sourceRow["BomAddSpeciesNo"] = item["BomAddSpeciesNo"] + "";
|
sourceRow["BomAddSpeciesNo"] = item["BomAddSpeciesNo"] + "";
|
||||||
|
sourceRow["BomAddChangeFileId"] = item["BomAddChangeFileId"] + "";
|
||||||
sourceRow["BomAddOldProductId"] = item["BomAddOldProductId"] + "";
|
sourceRow["BomAddOldProductId"] = item["BomAddOldProductId"] + "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user