cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r683

Browse Source 
SVN-Revision: r683
This commit is contained in:
tdx
2025-06-06 03:43:07 +00:00
parent 75aedd639f
commit fb1916d3b3
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+3 -18
View File
@@ -2804,8 +2804,6 @@ 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);
DataTable sourceTable = gcMain.gridControl.DataSourceTable(); DataTable sourceTable = gcMain.gridControl.DataSourceTable();
if (impRtnModel.ShowType.Equals("000") && sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted).Count() > 0) if (impRtnModel.ShowType.Equals("000") && sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted).Count() > 0)
{ {
@@ -2819,10 +2817,6 @@ 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");
@@ -2839,19 +2833,13 @@ namespace Lskj.PubBill
{ {
sourceTable.Columns.Add("BomAddSpeciesNo"); sourceTable.Columns.Add("BomAddSpeciesNo");
} }
if (!sourceTable.Columns.Contains("BomAddChangeFileId"))
{
sourceTable.Columns.Add("BomAddChangeFileId");
}
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");
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"));
DataRow mxRow = mxRows.FirstOrDefault(); DataRow mxRow = mxRows.FirstOrDefault();
@@ -2879,11 +2867,9 @@ 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;
if (fileNameWithoutExtension.StartsWith("MX")) if (fileNameWithoutExtension.StartsWith("MX"))
{ {
addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增"; addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
@@ -2894,25 +2880,24 @@ 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"] + "";
} }
} }
} }
} }
} }
string movepage = (this.ControlObj.ReplaceControlValue("'{qms_maddf_addMode}'")== "6") ? "-9998" : "-9999";
foreach (XtraTabPage xtraTabPage in this.tb_buttom.TabControlObj.TabPages) foreach (XtraTabPage xtraTabPage in this.tb_buttom.TabControlObj.TabPages)
{ {
if (xtraTabPage.Tag != null && (xtraTabPage.Tag != null && xtraTabPage.Tag is System.Windows.Forms.Control pageControl) && pageControl.Tag != null) if (xtraTabPage.Tag != null && (xtraTabPage.Tag != null && xtraTabPage.Tag is System.Windows.Forms.Control pageControl) && pageControl.Tag != null)
{ {
if (pageControl.Tag is GridDetailModel detailModel && (detailModel.Orderid + "").Equals("-9999"))
if (pageControl.Tag is GridDetailModel detailModel && (detailModel.Orderid + "").Equals(movepage))
{ {
this.tb_buttom.TabControlObj.SelectedTabPage = xtraTabPage; this.tb_buttom.TabControlObj.SelectedTabPage = xtraTabPage;
StaticControl.BomUnionPage = xtraTabPage;
if (xtraTabPage.Tag is GridControlEx) if (xtraTabPage.Tag is GridControlEx)
{ {
DataRow dataRow = this.gcMain.GetViewFocusedDataRow(); DataRow dataRow = this.gcMain.GetViewFocusedDataRow();