From 899c6731462aae6927f32c95237f16b6117acb0b Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Wed, 25 Jun 2025 03:36:04 +0000
Subject: [PATCH] SVN r783

SVN-Revision: r783
---
 插件库/Lskj.PubBomImport/FrmMain.cs     |  2 +-
 插件库/Lskj.PubBomImport/FrmProgress.cs | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/插件库/Lskj.PubBomImport/FrmMain.cs b/插件库/Lskj.PubBomImport/FrmMain.cs
index bf91a96..bb639ec 100644
--- a/插件库/Lskj.PubBomImport/FrmMain.cs
+++ b/插件库/Lskj.PubBomImport/FrmMain.cs
@@ -1655,7 +1655,7 @@ namespace Lskj.PubBomImport
                         continue;
                     }
                     DataRow row = columnsTable.Rows.Cast<DataRow>().Where(x => (x["excelFieldName"] + "").Equals(headerName)).FirstOrDefault();
-                    headerName = row != null ? row["clientFieldName"] + "" : headerName;
+                    headerName = row != null ? row["clientFieldName"] + "" : "";
                     if (string.IsNullOrWhiteSpace(headerName))
                     {
                         continue;
diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs
index cbaa936..ee47c9c 100644
--- a/插件库/Lskj.PubBomImport/FrmProgress.cs
+++ b/插件库/Lskj.PubBomImport/FrmProgress.cs
@@ -59,6 +59,7 @@ namespace Lskj.PubBomImport
                 {
                     string fileName = selectRow[Model.AfterBomFieldName] + "";
                     string dirPath = selectRow["BomFieldNameDir"] + "";
+                    //string productId = selectRow["BomMxMainProduct"] + "";
                     FileInfo fileInfo = new FileInfo(dirPath);
                     if (fileInfo != null)
                     {
@@ -1227,7 +1228,13 @@ namespace Lskj.PubBomImport
                 }
                 if (labelRemark == null)
                 {
-                    throw new Exception("变更数据异常，请检查");
+                    this.Invoke(new Action(() =>
+                    {
+                        this.DialogResult = DialogResult.OK;
+                        this.Close();
+                        ImportTimer?.Dispose();
+                    }));
+                    return;
                 }
                 string dirPath = labelRemark.filepath;
                 FileInfo parentInfo = null;
@@ -1821,8 +1828,8 @@ namespace Lskj.PubBomImport
                 if (mxRow != null)
                 {
                     string mxFileName = mxRow[Model.AfterBomFieldName] + "";
-                    string mxDirPath = mxRow["BomFieldNameDir"] + "";
                     string productId = mxRow["BomMxMainProduct"] + "";
+                    string mxDirPath = mxRow["BomFieldNameDir"] + "";
                     string addState = mxRow["BomMxAddState"] + "";
                     if (string.IsNullOrEmpty(productId))
                     {
@@ -3619,7 +3626,10 @@ namespace Lskj.PubBomImport
                         for (int j = firstRow.FirstCellNum; j < cellCount; j++)
                         {
                             ICell cell = row.GetCell(j);
-                            if (dataRow.Table.Columns.Count - 1 < dataRowIndex) break;
+                            if (dataRow.Table.Columns.Count - 1 < dataRowIndex)
+                            {
+                                break;
+                            }
                             if (cell != null && cell.IsMergedCell)
                             {
                                 CellRangeAddress mergrRange = FindMergedRegion(sheet, i, j);