From 76c877fce5274ab94d2af1ffc435447fdfadcbbe Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Sun, 15 Jun 2025 02:22:05 +0000
Subject: [PATCH] SVN r740

SVN-Revision: r740
---
 插件库/Lskj.PubBomImportNew/FrmMain.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/插件库/Lskj.PubBomImportNew/FrmMain.cs b/插件库/Lskj.PubBomImportNew/FrmMain.cs
index 227888f..26ecdba 100644
--- a/插件库/Lskj.PubBomImportNew/FrmMain.cs
+++ b/插件库/Lskj.PubBomImportNew/FrmMain.cs
@@ -165,7 +165,7 @@ namespace Lskj.PubBomImportNew
                              "else begin " +
                              "insert into P_SpecialImportTab (moduleId,rightMenuName,Ls_CondFilter,Ls_UnionColumn,Ls_CondPurview) values ('{0}','{1}','{2}','{3}','{4}') " +
                              "end";
-                sql = string.Format(sql, Model.ModuleCode, Model.ModuleId, "", unionColumn.Replace("'", "''"), "");
+                sql = string.Format(sql, Model.UnionModelCode, Model.ModuleId, "", unionColumn.Replace("'", "''"), "");
                 SqlHelper.ExecuteNonQuery(sql);
                 MessageUtil.Show("保存成功");
             }
@@ -219,7 +219,7 @@ namespace Lskj.PubBomImportNew
             GridColumn clientFieldNameColumn = this.gcMain.GridView.Columns.AddVisible("clientFieldName", "绑定程序列");
             clientFieldNameColumn.Width = 200;
 
-            DataTable gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.ModuleCode);
+            DataTable gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.UnionModelCode);
             //DataTable gridColumnsTab = BillImpl.GetDetailColumns(this.Model.ModuleCode);
             searchEdit.View.OptionsView.ShowIndicator = false;
             searchEdit.View.OptionsView.ColumnAutoWidth = false;
@@ -247,7 +247,7 @@ namespace Lskj.PubBomImportNew
             {
                 if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "moduleId"))
                 {
-                    string addColumnSql = "alter table P_SpecialImportTab add moduleId int";
+                    string addColumnSql = "alter table P_SpecialImportTab add moduleId varchar(100)";
                     SqlHelper.ExecuteNonQuery(addColumnSql);
                 }
                 if (!BaseImpl.HasExistsColumn("P_SpecialImportTab", "rightMenuName"))
@@ -273,7 +273,6 @@ namespace Lskj.PubBomImportNew
                 DataTable dataTable = new DataTable();
                 try
                 {
-                    string menuName = Model.ModuleId + "";
                     //if (Model.BillDetailSql.StartsWith("*"))
                     //{
                     //    string rightid = Model.BillDetailSql.TrimStart('*');
@@ -285,7 +284,7 @@ namespace Lskj.PubBomImportNew
                     //        menuName = rowItem["menuname"] + "";
                     //    }
                     //}
-                    string searchSql = string.Format("select * from P_SpecialImportTab where moduleId = '{0}' and rightMenuName = '{1}'", Model.ModuleCode, menuName);
+                    string searchSql = string.Format("select * from P_SpecialImportTab where moduleId = '{0}' and rightMenuName = '{1}'", Model.ModuleCode, Model.UnionModelCode);
                     dataTable = SqlHelper.ExecuteDataTable(searchSql);
                 }
                 catch (Exception)
@@ -310,7 +309,7 @@ namespace Lskj.PubBomImportNew
             }
             else
             {
-                string createTableSql = "create table P_SpecialImportTab (moduleId int,rightMenuName varchar(100),Ls_CondFilter varchar(1000),Ls_UnionColumn varchar(2000),Ls_CondPurview varchar(1000))";
+                string createTableSql = "create table P_SpecialImportTab (moduleId varchar(100),rightMenuName varchar(100),Ls_CondFilter varchar(1000),Ls_UnionColumn varchar(2000),Ls_CondPurview varchar(1000))";
                 SqlHelper.ExecuteNonQuery(createTableSql);
             }
         }