Merge branch 'main' of http://192.168.0.7:4133/cyf/lserp_cs_6.0
This commit is contained in:
@@ -1050,6 +1050,10 @@ namespace Lskj.Control
|
||||
this.gcMain.Model = this.Model;
|
||||
this.gcMain.SysModel = this.SysModel;
|
||||
this.gcMain.Dock = DockStyle.Fill;
|
||||
if (this.SysModel.GridObjIsCheck == 1)//主表加载复选框
|
||||
{
|
||||
GridDragGrid.GridAddCheckBox((this.gcMain as BandedGridControlEx).GridView);
|
||||
}
|
||||
this.panelControl1.Controls.Add(this.gcMain);
|
||||
if (this.SysModel.LoadFilter) (this.gcMain as BandedGridControlEx).GridView.OptionsView.ShowAutoFilterRow = true;
|
||||
(this.gcMain as BandedGridControlEx).gridControl.Tag = panel;
|
||||
@@ -3558,9 +3562,23 @@ namespace Lskj.Control
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.SysModel.afterimportSql))
|
||||
{
|
||||
string sql = this.SearchObj.ReplaceControlValue(this.SysModel.afterimportSql);
|
||||
string newResult = SqlHelper.ExecuteScalar(sql) + "";
|
||||
//if (!string.IsNullOrEmpty(newResult)) MessageUtil.Show(newResult);
|
||||
try
|
||||
{
|
||||
WaitForm.ShowForm();
|
||||
string sql = this.SearchObj.ReplaceControlValue(this.SysModel.afterimportSql);
|
||||
string newResult = SqlHelper.ExecuteScalar(sql) + "";
|
||||
//if (!string.IsNullOrEmpty(newResult)) MessageUtil.Show(newResult);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
string Message = ErrorMessage.PromptErrorMessage(e);
|
||||
MessageUtil.Show("基础档案导入后执行sql错误!" + Message);
|
||||
}
|
||||
finally
|
||||
{
|
||||
WaitForm.HideForm();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 刷新数据
|
||||
|
||||
Reference in New Issue
Block a user