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

SVN r1025

Browse Source 
SVN-Revision: r1025
This commit is contained in:
tdx
2025-11-04 03:34:52 +00:00
parent 3e56401eec
commit f00aa61886
2 changed files with 75 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBomImport/FrmBillInfo.Designer.cs
Generated
+42 -41
View File
@@ -130,9 +130,9 @@ namespace Lskj.PubBomImport
this.pl_main_center.Controls.Add(this.pl_main_center_detail);
this.pl_main_center.Controls.Add(this.pl_main_center_master);
this.pl_main_center.Dock = System.Windows.Forms.DockStyle.Fill;
this.pl_main_center.Location = new System.Drawing.Point(3, 41);
this.pl_main_center.Location = new System.Drawing.Point(2, 40);
this.pl_main_center.Name = "pl_main_center";
this.pl_main_center.Size = new System.Drawing.Size(660, 437);
this.pl_main_center.Size = new System.Drawing.Size(662, 439);
this.pl_main_center.TabIndex = 2;
//
// pl_main_center_detail
@@ -144,7 +144,7 @@ namespace Lskj.PubBomImport
this.pl_main_center_detail.Dock = System.Windows.Forms.DockStyle.Fill;
this.pl_main_center_detail.Location = new System.Drawing.Point(0, 164);
this.pl_main_center_detail.Name = "pl_main_center_detail";
this.pl_main_center_detail.Size = new System.Drawing.Size(660, 273);
this.pl_main_center_detail.Size = new System.Drawing.Size(662, 275);
this.pl_main_center_detail.TabIndex = 5;
//
// gcMain
@@ -156,7 +156,8 @@ namespace Lskj.PubBomImport
this.gcMain.Margin = new System.Windows.Forms.Padding(5);
this.gcMain.Name = "gcMain";
this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gcMain.Size = new System.Drawing.Size(660, 273);
this.gcMain.Size = new System.Drawing.Size(662, 275);
this.gcMain.SysModel = null;
this.gcMain.TabIndex = 0;
//
// pl_main_center_master
@@ -166,7 +167,7 @@ namespace Lskj.PubBomImport
this.pl_main_center_master.Dock = System.Windows.Forms.DockStyle.Top;
this.pl_main_center_master.Location = new System.Drawing.Point(0, 0);
this.pl_main_center_master.Name = "pl_main_center_master";
this.pl_main_center_master.Size = new System.Drawing.Size(660, 164);
this.pl_main_center_master.Size = new System.Drawing.Size(662, 164);
this.pl_main_center_master.TabIndex = 6;
//
// pl_treeview_detault_search
@@ -202,7 +203,7 @@ namespace Lskj.PubBomImport
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("宋体", 10F);
this.textEdit1.Properties.Appearance.Options.UseFont = true;
this.textEdit1.Size = new System.Drawing.Size(91, 26);
this.textEdit1.Size = new System.Drawing.Size(91, 20);
this.textEdit1.TabIndex = 5;
//
// lceCombobox
@@ -214,7 +215,7 @@ namespace Lskj.PubBomImport
this.lceCombobox.FontSize = 0F;
this.lceCombobox.LabelText = "查询";
this.lceCombobox.Location = new System.Drawing.Point(2, 4);
this.lceCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lceCombobox.Margin = new System.Windows.Forms.Padding(4);
this.lceCombobox.Model = null;
this.lceCombobox.Name = "lceCombobox";
this.lceCombobox.NullText = "";
@@ -266,9 +267,9 @@ namespace Lskj.PubBomImport
this.pl_main_bottom.Controls.Add(this.btnDelete);
this.pl_main_bottom.Controls.Add(this.btnBillSave);
this.pl_main_bottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pl_main_bottom.Location = new System.Drawing.Point(3, 478);
this.pl_main_bottom.Location = new System.Drawing.Point(2, 479);
this.pl_main_bottom.Name = "pl_main_bottom";
this.pl_main_bottom.Size = new System.Drawing.Size(660, 37);
this.pl_main_bottom.Size = new System.Drawing.Size(662, 37);
this.pl_main_bottom.TabIndex = 1;
//
// dbpFP
@@ -277,7 +278,7 @@ namespace Lskj.PubBomImport
this.dbpFP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.dbpFP.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dbpFP.Appearance.Options.UseFont = true;
this.dbpFP.Location = new System.Drawing.Point(-201, 7);
this.dbpFP.Location = new System.Drawing.Point(-199, 7);
this.dbpFP.Name = "dbpFP";
this.dbpFP.Size = new System.Drawing.Size(58, 26);
this.dbpFP.TabIndex = 34;
@@ -289,7 +290,7 @@ namespace Lskj.PubBomImport
this.btnRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnRefresh.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnRefresh.Appearance.Options.UseFont = true;
this.btnRefresh.Location = new System.Drawing.Point(-137, 7);
this.btnRefresh.Location = new System.Drawing.Point(-135, 7);
this.btnRefresh.Name = "btnRefresh";
this.btnRefresh.Size = new System.Drawing.Size(74, 26);
this.btnRefresh.TabIndex = 33;
@@ -301,7 +302,7 @@ namespace Lskj.PubBomImport
this.btnHiding.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnHiding.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnHiding.Appearance.Options.UseFont = true;
this.btnHiding.Location = new System.Drawing.Point(-61, 7);
this.btnHiding.Location = new System.Drawing.Point(-59, 7);
this.btnHiding.Name = "btnHiding";
this.btnHiding.Size = new System.Drawing.Size(67, 26);
this.btnHiding.TabIndex = 32;
@@ -314,7 +315,7 @@ namespace Lskj.PubBomImport
this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnHelp.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnHelp.Appearance.Options.UseFont = true;
this.btnHelp.Location = new System.Drawing.Point(8, 7);
this.btnHelp.Location = new System.Drawing.Point(10, 7);
this.btnHelp.Name = "btnHelp";
this.btnHelp.Size = new System.Drawing.Size(67, 26);
this.btnHelp.TabIndex = 30;
@@ -340,7 +341,7 @@ namespace Lskj.PubBomImport
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.cb_templete.Properties.DropDownRows = 8;
this.cb_templete.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.cb_templete.Size = new System.Drawing.Size(133, 28);
this.cb_templete.Size = new System.Drawing.Size(133, 20);
this.cb_templete.TabIndex = 19;
//
// lbl_templete
@@ -348,7 +349,7 @@ namespace Lskj.PubBomImport
this.lbl_templete.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl_templete.Location = new System.Drawing.Point(5, 8);
this.lbl_templete.Name = "lbl_templete";
this.lbl_templete.Size = new System.Drawing.Size(72, 18);
this.lbl_templete.Size = new System.Drawing.Size(48, 12);
this.lbl_templete.TabIndex = 16;
this.lbl_templete.Text = "选择模版";
//
@@ -374,7 +375,7 @@ namespace Lskj.PubBomImport
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.cb_input.Properties.DropDownRows = 8;
this.cb_input.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.cb_input.Size = new System.Drawing.Size(79, 28);
this.cb_input.Size = new System.Drawing.Size(79, 20);
this.cb_input.TabIndex = 19;
//
// txt_input
@@ -383,7 +384,7 @@ namespace Lskj.PubBomImport
this.txt_input.Name = "txt_input";
this.txt_input.Properties.Appearance.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txt_input.Properties.Appearance.Options.UseFont = true;
this.txt_input.Size = new System.Drawing.Size(98, 28);
this.txt_input.Size = new System.Drawing.Size(98, 20);
this.txt_input.TabIndex = 18;
//
// labelControl2
@@ -391,7 +392,7 @@ namespace Lskj.PubBomImport
this.labelControl2.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelControl2.Location = new System.Drawing.Point(5, 8);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(72, 18);
this.labelControl2.Size = new System.Drawing.Size(48, 12);
this.labelControl2.TabIndex = 16;
this.labelControl2.Text = "快速录入";
//
@@ -412,7 +413,7 @@ namespace Lskj.PubBomImport
this.dpbImport.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dpbImport.Appearance.Options.UseFont = true;
this.dpbImport.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show;
this.dpbImport.Location = new System.Drawing.Point(153, 7);
this.dpbImport.Location = new System.Drawing.Point(155, 7);
this.dpbImport.Name = "dpbImport";
this.dpbImport.Size = new System.Drawing.Size(74, 26);
this.dpbImport.TabIndex = 26;
@@ -424,7 +425,7 @@ namespace Lskj.PubBomImport
this.btnBillAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBillAdd.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnBillAdd.Appearance.Options.UseFont = true;
this.btnBillAdd.Location = new System.Drawing.Point(305, 7);
this.btnBillAdd.Location = new System.Drawing.Point(307, 7);
this.btnBillAdd.Name = "btnBillAdd";
this.btnBillAdd.Size = new System.Drawing.Size(67, 26);
this.btnBillAdd.TabIndex = 19;
@@ -436,7 +437,7 @@ namespace Lskj.PubBomImport
this.btnBillApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBillApply.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnBillApply.Appearance.Options.UseFont = true;
this.btnBillApply.Location = new System.Drawing.Point(512, 7);
this.btnBillApply.Location = new System.Drawing.Point(514, 7);
this.btnBillApply.Name = "btnBillApply";
this.btnBillApply.Size = new System.Drawing.Size(67, 26);
this.btnBillApply.TabIndex = 25;
@@ -449,7 +450,7 @@ namespace Lskj.PubBomImport
this.dpCopyBill.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dpCopyBill.Appearance.Options.UseFont = true;
this.dpCopyBill.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show;
this.dpCopyBill.Location = new System.Drawing.Point(229, 7);
this.dpCopyBill.Location = new System.Drawing.Point(231, 7);
this.dpCopyBill.Name = "dpCopyBill";
this.dpCopyBill.Size = new System.Drawing.Size(74, 26);
this.dpCopyBill.TabIndex = 24;
@@ -462,7 +463,7 @@ namespace Lskj.PubBomImport
this.btnPrint.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnPrint.Appearance.Options.UseFont = true;
this.btnPrint.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show;
this.btnPrint.Location = new System.Drawing.Point(581, 7);
this.btnPrint.Location = new System.Drawing.Point(583, 7);
this.btnPrint.Name = "btnPrint";
this.btnPrint.Size = new System.Drawing.Size(74, 26);
this.btnPrint.TabIndex = 23;
@@ -475,7 +476,7 @@ namespace Lskj.PubBomImport
this.dpbTools.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dpbTools.Appearance.Options.UseFont = true;
this.dpbTools.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show;
this.dpbTools.Location = new System.Drawing.Point(77, 7);
this.dpbTools.Location = new System.Drawing.Point(79, 7);
this.dpbTools.Name = "dpbTools";
this.dpbTools.Size = new System.Drawing.Size(74, 26);
this.dpbTools.TabIndex = 22;
@@ -487,7 +488,7 @@ namespace Lskj.PubBomImport
this.btnDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnDelete.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnDelete.Appearance.Options.UseFont = true;
this.btnDelete.Location = new System.Drawing.Point(374, 7);
this.btnDelete.Location = new System.Drawing.Point(376, 7);
this.btnDelete.Name = "btnDelete";
this.btnDelete.Size = new System.Drawing.Size(67, 26);
this.btnDelete.TabIndex = 20;
@@ -499,7 +500,7 @@ namespace Lskj.PubBomImport
this.btnBillSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBillSave.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnBillSave.Appearance.Options.UseFont = true;
this.btnBillSave.Location = new System.Drawing.Point(443, 7);
this.btnBillSave.Location = new System.Drawing.Point(445, 7);
this.btnBillSave.Name = "btnBillSave";
this.btnBillSave.Size = new System.Drawing.Size(67, 26);
this.btnBillSave.TabIndex = 21;
@@ -513,9 +514,9 @@ namespace Lskj.PubBomImport
this.pl_main_top.Controls.Add(this.pl_main_top_right);
this.pl_main_top.Controls.Add(this.pl_main_top_left);
this.pl_main_top.Dock = System.Windows.Forms.DockStyle.Top;
this.pl_main_top.Location = new System.Drawing.Point(3, 3);
this.pl_main_top.Location = new System.Drawing.Point(2, 2);
this.pl_main_top.Name = "pl_main_top";
this.pl_main_top.Size = new System.Drawing.Size(660, 38);
this.pl_main_top.Size = new System.Drawing.Size(662, 38);
this.pl_main_top.TabIndex = 0;
//
// pl_main_top_center
@@ -525,9 +526,9 @@ namespace Lskj.PubBomImport
this.pl_main_top_center.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.pl_main_top_center.Controls.Add(this.lbTitle);
this.pl_main_top_center.Dock = System.Windows.Forms.DockStyle.Fill;
this.pl_main_top_center.Location = new System.Drawing.Point(163, 3);
this.pl_main_top_center.Location = new System.Drawing.Point(162, 2);
this.pl_main_top_center.Name = "pl_main_top_center";
this.pl_main_top_center.Size = new System.Drawing.Size(311, 32);
this.pl_main_top_center.Size = new System.Drawing.Size(315, 34);
this.pl_main_top_center.TabIndex = 3;
//
// lbTitle
@@ -538,7 +539,7 @@ namespace Lskj.PubBomImport
this.lbTitle.ForeColor = System.Drawing.Color.Blue;
this.lbTitle.Location = new System.Drawing.Point(0, 0);
this.lbTitle.Name = "lbTitle";
this.lbTitle.Size = new System.Drawing.Size(311, 32);
this.lbTitle.Size = new System.Drawing.Size(315, 34);
this.lbTitle.TabIndex = 1;
this.lbTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -550,9 +551,9 @@ namespace Lskj.PubBomImport
this.pl_main_top_right.Controls.Add(this.lblOrderNo);
this.pl_main_top_right.Controls.Add(this.labelControl1);
this.pl_main_top_right.Dock = System.Windows.Forms.DockStyle.Right;
this.pl_main_top_right.Location = new System.Drawing.Point(474, 3);
this.pl_main_top_right.Location = new System.Drawing.Point(477, 2);
this.pl_main_top_right.Name = "pl_main_top_right";
this.pl_main_top_right.Size = new System.Drawing.Size(183, 32);
this.pl_main_top_right.Size = new System.Drawing.Size(183, 34);
this.pl_main_top_right.TabIndex = 2;
//
// lblOrderNo
@@ -562,7 +563,7 @@ namespace Lskj.PubBomImport
this.lblOrderNo.Appearance.ForeColor = System.Drawing.Color.Blue;
this.lblOrderNo.Location = new System.Drawing.Point(67, 19);
this.lblOrderNo.Name = "lblOrderNo";
this.lblOrderNo.Size = new System.Drawing.Size(135, 18);
this.lblOrderNo.Size = new System.Drawing.Size(90, 12);
this.lblOrderNo.TabIndex = 1;
this.lblOrderNo.Text = "XTC170112010001";
//
@@ -573,7 +574,7 @@ namespace Lskj.PubBomImport
this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Blue;
this.labelControl1.Location = new System.Drawing.Point(7, 19);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(81, 18);
this.labelControl1.Size = new System.Drawing.Size(54, 12);
this.labelControl1.TabIndex = 0;
this.labelControl1.Text = "单据编号:";
//
@@ -585,9 +586,9 @@ namespace Lskj.PubBomImport
this.pl_main_top_left.Controls.Add(this.pl_red);
this.pl_main_top_left.Controls.Add(this.pl_blue);
this.pl_main_top_left.Dock = System.Windows.Forms.DockStyle.Left;
this.pl_main_top_left.Location = new System.Drawing.Point(3, 3);
this.pl_main_top_left.Location = new System.Drawing.Point(2, 2);
this.pl_main_top_left.Name = "pl_main_top_left";
this.pl_main_top_left.Size = new System.Drawing.Size(160, 32);
this.pl_main_top_left.Size = new System.Drawing.Size(160, 34);
this.pl_main_top_left.TabIndex = 1;
//
// pl_red
@@ -599,7 +600,7 @@ namespace Lskj.PubBomImport
this.pl_red.Dock = System.Windows.Forms.DockStyle.Left;
this.pl_red.Location = new System.Drawing.Point(80, 0);
this.pl_red.Name = "pl_red";
this.pl_red.Size = new System.Drawing.Size(80, 32);
this.pl_red.Size = new System.Drawing.Size(80, 34);
this.pl_red.TabIndex = 3;
//
// rdRed
@@ -609,7 +610,7 @@ namespace Lskj.PubBomImport
this.rdRed.ForeColor = System.Drawing.Color.Red;
this.rdRed.Location = new System.Drawing.Point(6, 12);
this.rdRed.Name = "rdRed";
this.rdRed.Size = new System.Drawing.Size(105, 22);
this.rdRed.Size = new System.Drawing.Size(71, 16);
this.rdRed.TabIndex = 3;
this.rdRed.Text = "红字单据";
this.rdRed.UseVisualStyleBackColor = true;
@@ -623,7 +624,7 @@ namespace Lskj.PubBomImport
this.pl_blue.Dock = System.Windows.Forms.DockStyle.Left;
this.pl_blue.Location = new System.Drawing.Point(0, 0);
this.pl_blue.Name = "pl_blue";
this.pl_blue.Size = new System.Drawing.Size(80, 32);
this.pl_blue.Size = new System.Drawing.Size(80, 34);
this.pl_blue.TabIndex = 2;
//
// rdBlue
@@ -634,7 +635,7 @@ namespace Lskj.PubBomImport
this.rdBlue.ForeColor = System.Drawing.Color.Blue;
this.rdBlue.Location = new System.Drawing.Point(7, 12);
this.rdBlue.Name = "rdBlue";
this.rdBlue.Size = new System.Drawing.Size(105, 22);
this.rdBlue.Size = new System.Drawing.Size(71, 16);
this.rdBlue.TabIndex = 2;
this.rdBlue.TabStop = true;
this.rdBlue.Text = "蓝字单据";
插件库/Lskj.PubBomImport/FrmProgress.cs
+33 -1
View File
@@ -2578,6 +2578,38 @@ namespace Lskj.PubBomImport
FrmBillInfo frmBillInfo = new FrmBillInfo();
int.TryParse(Model.FirstRowIndex + "", out int firstRowIndex);
DataTable parentTable = ExcelToDatatable(mxInfo.FullName, Model, Model.SheetName, firstRowIndex);
//string[] condArray = Model.ReadTableCond.Split('^');
//string endCond = condArray.Length > 1 ? condArray[1] : "";
//if (!string.IsNullOrEmpty(endCond))
//{
// List<DataRow> condRows = new List<DataRow>();
// foreach (DataRow item in parentTable.Rows)
// {
// if (ReplaceHelper.ReplaceRowParamCond(item, endCond))
// {
// break;
// }
// else
// {
// condRows.Add(item);
// }
// }
// parentTable = condRows.CopyToDataTable();
//}
string endCond = "'{物料编码}'='END'";
List<DataRow> condRows = new List<DataRow>();
foreach (DataRow item in parentTable.Rows)
{
if (ReplaceHelper.ReplaceRowParamCond(item, endCond))
{
break;
}
else
{
condRows.Add(item);
}
}
parentTable = condRows.CopyToDataTable();
parentTable = parentTable.Rows.Cast<DataRow>().Where(n => int.TryParse(n["序号"] + "", out _) && !string.IsNullOrEmpty(n["物料编码"] + "")).ToList().CopyToDataTable();
//StringBuilder stringBuilder = new StringBuilder();
//foreach (DataRow dataRow in parentTable.Rows)
@@ -3743,7 +3775,7 @@ namespace Lskj.PubBomImport
for (int i = startRow; i <= rowCount; i++)//循环遍历所有行
{
IRow row = sheet.GetRow(i);//第几行
if (row == null)
if (row == null || row.ZeroHeight)
{
continue; //没有数据的行默认是null;
}