SVN r667
SVN-Revision: r667
This commit is contained in:
@@ -2788,13 +2788,20 @@ namespace Lskj.PubBill
|
||||
MessageUtil.Show($"物料编码必填");
|
||||
return;
|
||||
}
|
||||
ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault();
|
||||
ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("文件分类")).FirstOrDefault();
|
||||
string addMode = ControlObj.GetControlValue(modeControlModel);
|
||||
if (impRtnModel.ShowType.Equals("1"))
|
||||
{
|
||||
MessageUtil.Show($"上传模式必填");
|
||||
return;
|
||||
}
|
||||
ControlModel sepciesNoControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault();
|
||||
string sepciesNo = ControlObj.GetControlValue(sepciesNoControlModel);
|
||||
if (impRtnModel.ShowType.Equals("1") || impRtnModel.ShowType.Equals("6"))
|
||||
{
|
||||
MessageUtil.Show($"节点编号必填必填");
|
||||
return;
|
||||
}
|
||||
DataTable sourceTable = gcMain.gridControl.DataSourceTable();
|
||||
if (sourceTable != null && impRtnModel.FileNames != null)
|
||||
{
|
||||
@@ -2815,12 +2822,17 @@ namespace Lskj.PubBill
|
||||
{
|
||||
sourceTable.Columns.Add("qms_laddf_mode");
|
||||
}
|
||||
if (!sourceTable.Columns.Contains("BomAddSpeciesNo"))
|
||||
{
|
||||
sourceTable.Columns.Add("BomAddSpeciesNo");
|
||||
}
|
||||
DataTable dataTable = new DataTable();
|
||||
dataTable.Columns.Add(afterBomFieldName);
|
||||
dataTable.Columns.Add("BomFieldNameDir");
|
||||
dataTable.Columns.Add("BomMxMainProduct");
|
||||
dataTable.Columns.Add("BomMxAddState");
|
||||
dataTable.Columns.Add("qms_laddf_mode");
|
||||
dataTable.Columns.Add("BomAddSpeciesNo");
|
||||
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();
|
||||
@@ -2850,6 +2862,7 @@ namespace Lskj.PubBill
|
||||
addRow["BomFieldNameDir"] = fileName;
|
||||
addRow["BomMxMainProduct"] = mxProductId;
|
||||
addRow["qms_laddf_mode"] = addMode;
|
||||
addRow["BomAddSpeciesNo"] = sepciesNo;
|
||||
if (fileNameWithoutExtension.StartsWith("MX"))
|
||||
{
|
||||
addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
|
||||
@@ -2863,6 +2876,7 @@ namespace Lskj.PubBill
|
||||
sourceRow["BomMxMainProduct"] = item["BomMxMainProduct"] + "";
|
||||
sourceRow["BomMxAddState"] = item["BomMxAddState"] + "";
|
||||
sourceRow["qms_laddf_mode"] = item["qms_laddf_mode"] + "";
|
||||
sourceRow["BomAddSpeciesNo"] = item["BomAddSpeciesNo"] + "";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4723,9 +4737,9 @@ namespace Lskj.PubBill
|
||||
DataRow menuRow = BaseModuleImpl.GetBaseGridRightMenuById(BillModel.BeforeBillSaveExec);
|
||||
if (menuRow != null)
|
||||
{
|
||||
DataTable table = gcMain.gridControl.DataSourceTable();
|
||||
ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault();
|
||||
string addMode = ControlObj.GetControlValue(modeControlModel);
|
||||
DataTable table = gcMain.gridControl.DataSourceTable();
|
||||
if (modeControlModel != null && table.Columns.Contains("qms_laddf_mode"))
|
||||
{
|
||||
foreach (DataRow item in table.Rows)
|
||||
@@ -4733,6 +4747,15 @@ namespace Lskj.PubBill
|
||||
item["qms_laddf_mode"] = addMode;
|
||||
}
|
||||
}
|
||||
ControlModel speciesNoControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("文件分类")).FirstOrDefault();
|
||||
string speciesNo = ControlObj.GetControlValue(speciesNoControlModel);
|
||||
if (speciesNoControlModel != null && table.Columns.Contains("BomAddSpeciesNo"))
|
||||
{
|
||||
foreach (DataRow item in table.Rows)
|
||||
{
|
||||
item["BomAddSpeciesNo"] = speciesNo;
|
||||
}
|
||||
}
|
||||
CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, this.gcMain);
|
||||
menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
|
||||
menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
|
||||
|
||||
Reference in New Issue
Block a user