From 95fd18af4a2a49c1dfa52c7e1eeecaa629adfe6e Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Fri, 30 Jan 2026 07:56:54 +0000
Subject: [PATCH] SVN r1112

SVN-Revision: r1112
---
 插件库/Lskj.PubBomImport/FrmMain.cs | 41 ++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/插件库/Lskj.PubBomImport/FrmMain.cs b/插件库/Lskj.PubBomImport/FrmMain.cs
index b8c679f..e731123 100644
--- a/插件库/Lskj.PubBomImport/FrmMain.cs
+++ b/插件库/Lskj.PubBomImport/FrmMain.cs
@@ -1164,27 +1164,29 @@ namespace Lskj.PubBomImport
         {
             if (BaseImpl.HasExistsTable("P_SpecialImportTab"))
             {
-                if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "moduleId"))
+                DataTable TabColumnsb = BaseImpl.GetTableColumns("P_SpecialImportTab");
+
+                if (!TabColumnsb.Columns.Contains("moduleId"))
                 {
                     string addColumnSql = "alter table P_SpecialImportTab add moduleId int";
                     SqlHelper.ExecuteNonQuery(addColumnSql);
                 }
-                if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "rightMenuName"))
+                if (!TabColumnsb.Columns.Contains("rightMenuName"))
                 {
                     string addColumnSql = "alter table P_SpecialImportTab add rightMenuName varchar(100)";
                     SqlHelper.ExecuteNonQuery(addColumnSql);
                 }
-                if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "Ls_CondFilter"))
+                if (!TabColumnsb.Columns.Contains("Ls_CondFilter"))
                 {
                     string addColumnSql = "alter table P_SpecialImportTab add Ls_CondFilter varchar(1000)";
                     SqlHelper.ExecuteNonQuery(addColumnSql);
                 }
-                if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "Ls_UnionColumn"))
+                if (!TabColumnsb.Columns.Contains("Ls_UnionColumn"))
                 {
                     string addColumnSql = "alter table P_SpecialImportTab add Ls_UnionColumn varchar(2000)";
                     SqlHelper.ExecuteNonQuery(addColumnSql);
                 }
-                if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "Ls_CondPurview"))
+                if (!TabColumnsb.Columns.Contains("Ls_CondPurview"))
                 {
                     string addColumnSql = "alter table P_SpecialImportTab add Ls_CondPurview varchar(1000)";
                     SqlHelper.ExecuteNonQuery(addColumnSql);
@@ -2386,4 +2388,31 @@ namespace Lskj.PubBomImport
                             {
                                 case CellType.String:
                                     cellValue = cell.StringCellValue;
-              
\ No newline at end of file
+                                    break;
+                                case CellType.Numeric:
+                                    cellValue = cell.NumericCellValue.ToString();
+                                    break;
+                                case CellType.Boolean:
+                                    cellValue = cell.BooleanCellValue.ToString();
+                                    break;
+                                case CellType.Blank:
+                                    break;
+                                default:
+                                    cellValue.ToString();
+                                    break;
+                            }
+                            break;
+                        default:
+                            cellValue = cell.ToString();
+                            break;
+                    }
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return cellValue;
+        }
+        #endregion
+    }
+}