SVN r681
SVN-Revision: r681
This commit is contained in:
@@ -982,7 +982,7 @@ namespace Lskj.PubBill
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, this.gcMain);
|
||||
menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
|
||||
menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
|
||||
@@ -2804,6 +2804,8 @@ namespace Lskj.PubBill
|
||||
MessageUtil.Show($"文件分类必填");
|
||||
return;
|
||||
}
|
||||
ControlModel fileIDControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("文件ID")).FirstOrDefault();
|
||||
string fileID = ControlObj.GetControlValue(fileIDControlModel);
|
||||
DataTable sourceTable = gcMain.gridControl.DataSourceTable();
|
||||
if (impRtnModel.ShowType.Equals("000") && sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted).Count() > 0)
|
||||
{
|
||||
@@ -2817,6 +2819,10 @@ namespace Lskj.PubBill
|
||||
{
|
||||
sourceTable.Columns.Add("BomFieldNameDir");
|
||||
}
|
||||
if (!sourceTable.Columns.Contains("BomFieldNamePath"))
|
||||
{
|
||||
sourceTable.Columns.Add("BomFieldNamePath");
|
||||
}
|
||||
if (!sourceTable.Columns.Contains("BomMxMainProduct"))
|
||||
{
|
||||
sourceTable.Columns.Add("BomMxMainProduct");
|
||||
@@ -2833,13 +2839,19 @@ namespace Lskj.PubBill
|
||||
{
|
||||
sourceTable.Columns.Add("BomAddSpeciesNo");
|
||||
}
|
||||
if (!sourceTable.Columns.Contains("BomAddChangeFileId"))
|
||||
{
|
||||
sourceTable.Columns.Add("BomAddChangeFileId");
|
||||
}
|
||||
DataTable dataTable = new DataTable();
|
||||
dataTable.Columns.Add(afterBomFieldName);
|
||||
dataTable.Columns.Add("BomFieldNameDir");
|
||||
dataTable.Columns.Add("BomFieldNamePath");
|
||||
dataTable.Columns.Add("BomMxMainProduct");
|
||||
dataTable.Columns.Add("BomMxAddState");
|
||||
dataTable.Columns.Add("qms_laddf_mode");
|
||||
dataTable.Columns.Add("BomAddSpeciesNo");
|
||||
dataTable.Columns.Add("BomAddChangeFileId");
|
||||
IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
|
||||
var mxRows = rowsIEnumerable.Where(n => (n[afterBomFieldName] + "").Trim().StartsWith("MX"));
|
||||
DataRow mxRow = mxRows.FirstOrDefault();
|
||||
@@ -2867,9 +2879,11 @@ namespace Lskj.PubBill
|
||||
DataRow addRow = dataTable.NewRow();
|
||||
addRow[afterBomFieldName] = fileNameWithoutExtension;
|
||||
addRow["BomFieldNameDir"] = fileName;
|
||||
addRow["BomFieldNamePath"] = Path.GetFileName(fileName);
|
||||
addRow["BomMxMainProduct"] = mxProductId;
|
||||
addRow["qms_laddf_mode"] = addMode;
|
||||
addRow["BomAddSpeciesNo"] = sepciesNo;
|
||||
addRow["BomAddChangeFileId"] = fileID;
|
||||
if (fileNameWithoutExtension.StartsWith("MX"))
|
||||
{
|
||||
addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
|
||||
@@ -2880,10 +2894,12 @@ namespace Lskj.PubBill
|
||||
{
|
||||
DataRow sourceRow = this.AddRowToGridView(item, true);
|
||||
sourceRow["BomFieldNameDir"] = item["BomFieldNameDir"] + "";
|
||||
sourceRow["BomFieldNamePath"] = item["BomFieldNamePath"] + "";
|
||||
sourceRow["BomMxMainProduct"] = item["BomMxMainProduct"] + "";
|
||||
sourceRow["BomMxAddState"] = item["BomMxAddState"] + "";
|
||||
sourceRow["qms_laddf_mode"] = item["qms_laddf_mode"] + "";
|
||||
sourceRow["BomAddSpeciesNo"] = item["BomAddSpeciesNo"] + "";
|
||||
sourceRow["BomAddChangeFileId"] = item["BomAddChangeFileId"] + "";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2896,6 +2912,7 @@ namespace Lskj.PubBill
|
||||
if (pageControl.Tag is GridDetailModel detailModel && (detailModel.Orderid + "").Equals("-9999"))
|
||||
{
|
||||
this.tb_buttom.TabControlObj.SelectedTabPage = xtraTabPage;
|
||||
StaticControl.BomUnionPage = xtraTabPage;
|
||||
if (xtraTabPage.Tag is GridControlEx)
|
||||
{
|
||||
DataRow dataRow = this.gcMain.GetViewFocusedDataRow();
|
||||
|
||||
Reference in New Issue
Block a user