SVN r1034

SVN-Revision: r1034
This commit is contained in:
tdx
2025-11-11 03:39:58 +00:00
parent ff75e9105b
commit 4d28954a9c
+19 -18
View File
@@ -116,7 +116,7 @@ namespace Lskj.PubProductSysMge
/// <summary>
/// 表名集合(pl_Top中控件对应保存到的表名)
/// </summary>
public Dictionary<string,string> TableNameList = new Dictionary<string, string>();
public Dictionary<string, ModuleModel> TableNameList = new Dictionary<string, ModuleModel>();
/// <summary>
/// 规格控件
@@ -698,7 +698,7 @@ namespace Lskj.PubProductSysMge
baseControl.ReadOnly = setModel.ProhibitEdited;
this.pl_Top.Controls.Add(baseControl);
this.ControlList.Add(setModel);
if (!this.TableNameList.ContainsKey(setModel.SaveModeCode))
if (!this.TableNameList.ContainsKey(setModel.SaveModeCode))
{
DataRow modelRow = MainImpl.GetSystemdllTab(setModel.SaveModeCode);//获取模块信息
if (modelRow == null)
@@ -706,9 +706,9 @@ namespace Lskj.PubProductSysMge
MessageUtil.Show("模块编号[" + setModel.SaveModeCode + "],配置错误!\r\n该模块信息未找到!");
}
ModuleModel sysModel = new ModuleModel(modelRow);// 系统模块实体对象
this.TableNameList.Add(setModel.SaveModeCode, sysModel.MenuTable);
this.TableNameList.Add(setModel.SaveModeCode, sysModel);
}
if (x + baseControl.Width + 15 + baseControl.Width > this.splitMainContainer.Panel2.Width)
{
x = 10;
@@ -1358,7 +1358,7 @@ namespace Lskj.PubProductSysMge
{
StringBuilder keyBuilderFb = new StringBuilder();
StringBuilder valueBuilderFb = new StringBuilder();
List<BaseUserControl> modelControls = this.pl_Top.Controls.Cast<BaseUserControl>().Where(n => !string.IsNullOrEmpty((n.Tag as SysSetModel).DbName )&& modeCode.Equals((n.Tag as SysSetModel).SaveModeCode)).OrderBy(n => (n.Tag as SysSetModel).OrderId).ToList();
List<BaseUserControl> modelControls = this.pl_Top.Controls.Cast<BaseUserControl>().Where(n => !string.IsNullOrEmpty((n.Tag as SysSetModel).DbName) && modeCode.Equals((n.Tag as SysSetModel).SaveModeCode)).OrderBy(n => (n.Tag as SysSetModel).OrderId).ToList();
foreach (BaseUserControl item in modelControls)
{
SysSetModel sysSetModel = item.Tag as SysSetModel;
@@ -1380,19 +1380,19 @@ namespace Lskj.PubProductSysMge
keyBuilder.Append(string.Format("{0},", sysSetModel.DbName));
valueBuilder.Append(string.Format("N'{0}',", fxValue.Replace("'", "''")));
}
else
else
{
keyBuilderFb.Append(string.Format("{0},", sysSetModel.DbName));
valueBuilderFb.Append(string.Format("N'{0}',", fxValue.Replace("'", "''")));
}
}
}
if (!string.IsNullOrWhiteSpace(keyBuilderFb+""))
{
string tablename = TableNameList[modeCode];
string insertSqlFb = string.Format("insert into {0}({1}) values({2});", tablename, keyBuilderFb.ToString().TrimEnd(','), valueBuilderFb.ToString().TrimEnd(','));
if (!string.IsNullOrWhiteSpace(keyBuilderFb + ""))
{
ModuleModel saveTableModel = TableNameList[modeCode];
string tablename = TableNameList[modeCode].MenuTable;
string insertSqlFb = string.Format("insert into {0}({1}) values({2});", saveTableModel.MenuTable, keyBuilderFb.ToString().TrimEnd(','), valueBuilderFb.ToString().TrimEnd(','));
BaseSaveModel saveModelFb = new BaseSaveModel
{
BaseSaveType = SaveType.Add,
@@ -1402,13 +1402,13 @@ namespace Lskj.PubProductSysMge
MenuCode = modeCode,
TableName = tablename,
ComfirmFlag = 0,
NewVer = MainModuleObj.NewVer
NewVer = saveTableModel.NewVer
};
int resultFb = BaseModuleImpl.SaveBasePanelData(saveModelFb);
}
}
@@ -1561,10 +1561,11 @@ namespace Lskj.PubProductSysMge
}
}
if (!string.IsNullOrWhiteSpace(sqlBuilder + ""))
if (!string.IsNullOrWhiteSpace(sqlBuilder + ""))
{
string tablename = TableNameList[modeCode];
string updateSql = string.Format("update {0} set {1} where {2}='{3}';", tablename, sqlBuilderFb.ToString().TrimEnd(','),primaryKey, newBillNo);
ModuleModel saveTableModel = TableNameList[modeCode];
string tablename = TableNameList[modeCode].MenuTable;
string updateSql = string.Format("update {0} set {1} where {2}='{3}';", tablename, sqlBuilderFb.ToString().TrimEnd(','), primaryKey, newBillNo);
BaseSaveModel saveModelFb = new BaseSaveModel
{
BaseSaveType = SaveType.Update,
@@ -1574,14 +1575,14 @@ namespace Lskj.PubProductSysMge
MenuCode = modeCode,
TableName = tablename,
ComfirmFlag = 0,
NewVer = MainModuleObj.NewVer
NewVer = saveTableModel.NewVer
};
int resultFb = BaseModuleImpl.SaveBasePanelData(saveModelFb);
}
}