From 82459d0891220c2c083ac57c83c1edad51a2316f Mon Sep 17 00:00:00 2001 From: wyf Date: Wed, 7 May 2025 11:41:29 +0000 Subject: [PATCH] SVN r548 SVN-Revision: r548 --- 插件库/Lskj.PubBomImport/FrmProgress.cs | 31 ++++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs index 3aae8b9..00484bb 100644 --- a/插件库/Lskj.PubBomImport/FrmProgress.cs +++ b/插件库/Lskj.PubBomImport/FrmProgress.cs @@ -797,14 +797,7 @@ namespace Lskj.PubBomImport frmBillInfo.OnBillAdd(); SetProcessBar(0, 0); SetProcessMsg($"正在导入：{Path.GetFileName(parentInfo.FullName)}"); - DataTable childTable = new DataTable(); - foreach (GridColumn gridColumn in frmBillInfo.GcMainView.Columns) - { - if (!childTable.Columns.Contains(gridColumn.FieldName)) - { - childTable.Columns.Add(gridColumn.FieldName, gridColumn.ColumnType); - } - } + DataTable childTable = frmBillInfo.GcMainView.GridControl.DataSourceTable().Clone(); foreach (DataRow parentRow in parentTable.Rows) { string childCode = parentRow["图号"] + ""; @@ -828,7 +821,7 @@ namespace Lskj.PubBomImport { int.TryParse(parentRow["套数"] + "", out int tamount); string childCode = parentRow["图号"] + ""; - if (code.StartsWith("QD") || code.StartsWith("ZZQD")) + if (childCode.StartsWith("QD") || childCode.StartsWith("ZZQD")) { string tempFileName = childFileDic[childCode]; FileInfo childInfo = new FileInfo(tempFileName); @@ -838,7 +831,7 @@ namespace Lskj.PubBomImport } if (childInfo != null) { - if (code.StartsWith("ZZQD")) + if (childCode.StartsWith("ZZQD")) { DataTable zzqdTable = ExcelToDatatable(childInfo.FullName, Model, "", index); //frmMain.Invoke(new Action(() => @@ -862,7 +855,7 @@ namespace Lskj.PubBomImport DataRow childRow = childTable.NewRow(); childRow["ProductId"] = zzqdItem["物料编码"] + ""; childRow["appellation"] = zzqdItem["名称"] + ""; - childRow["bak"] = code; + childRow["bak"] = childCode; childRow["tamount"] = parentRow["套数"] + ""; int.TryParse(zzqdItem["数量"] + "", out int amount); childRow["amount"] = amount * tamount; @@ -1191,14 +1184,14 @@ namespace Lskj.PubBomImport frmBillInfo.OnBillAdd(); SetProcessBar(0, 0); SetProcessMsg($"正在导入：{Path.GetFileName(mxInfo.FullName)}"); - DataTable childTable = new DataTable(); - foreach (GridColumn gridColumn in frmBillInfo.GcMainView.Columns) - { - if (!childTable.Columns.Contains(gridColumn.FieldName)) - { - childTable.Columns.Add(gridColumn.FieldName, gridColumn.ColumnType); - } - } + DataTable childTable = frmBillInfo.GcMainView.GridControl.DataSourceTable().Clone(); + //foreach (GridColumn gridColumn in frmBillInfo.GcMainView.Columns) + //{ + // if (!childTable.Columns.Contains(gridColumn.FieldName)) + // { + // childTable.Columns.Add(gridColumn.FieldName, gridColumn.ColumnType); + // } + //} foreach (DataRow parentRow in parentTable.Rows) { int.TryParse(parentRow["套数"] + "", out int tamount);