cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r615

Browse Source 
SVN-Revision: r615
This commit is contained in:
wyf
2025-05-21 09:52:29 +00:00
parent 87e2638111
commit 4eea773241
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+9 -8
View File
@@ -466,6 +466,7 @@ namespace Lskj.PubBill
})); }));
Task<Hashtable> sourcesTask = cachesDic.AddTask(this, "Sources", new Task<Hashtable>(() => Task<Hashtable> sourcesTask = cachesDic.AddTask(this, "Sources", new Task<Hashtable>(() =>
{ {
DataRow menuConfigRow = menuConfigTabTask.Result;
return BillImpl.GetSources(dynamicModel.ModuleCode, billModel.BillSourceIds);//获取单据来源 return BillImpl.GetSources(dynamicModel.ModuleCode, billModel.BillSourceIds);//获取单据来源
})); }));
cachesDic.AddTask(tb_buttom, "DynamicModel", dynamicModelTask); cachesDic.AddTask(tb_buttom, "DynamicModel", dynamicModelTask);
@@ -1114,7 +1115,7 @@ namespace Lskj.PubBill
{ {
this.gcMain.GridView.RowCellClick += OngcMainRowCellClick; this.gcMain.GridView.RowCellClick += OngcMainRowCellClick;
} }
this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged; this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
} }
@@ -1268,7 +1269,7 @@ namespace Lskj.PubBill
//树表格 //树表格
gcMain.AddHeadquarters(dataRow); gcMain.AddHeadquarters(dataRow);
} }
else if(MultiLineSummary) else if (MultiLineSummary)
{ {
MultiLineSummary = false; MultiLineSummary = false;
//清空新加的汇总列 //清空新加的汇总列
@@ -3243,7 +3244,7 @@ namespace Lskj.PubBill
} }
} }
if (table != null ) if (table != null)
{ {
UpdateSummaryData(table); UpdateSummaryData(table);
} }
@@ -4926,7 +4927,7 @@ namespace Lskj.PubBill
{ {
case 1: case 1:
// 提交成功 // 提交成功
if(!this.BillModel.DisableSubmitPrompt) MessageUtil.Show(BillModel.TypeName + ResourceKeys.ApplySuccess); if (!this.BillModel.DisableSubmitPrompt) MessageUtil.Show(BillModel.TypeName + ResourceKeys.ApplySuccess);
this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, billNo))); this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, billNo)));
this.RefreshSource(GetBillSourceManager()); this.RefreshSource(GetBillSourceManager());
this.RefreshSelectedSource(); this.RefreshSelectedSource();
@@ -5317,7 +5318,7 @@ namespace Lskj.PubBill
if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime) if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime)
{ {
string billNo = this.lblOrderNo.Text; string billNo = this.lblOrderNo.Text;
this.gcMain.GridView.DataSourceChanged -= OnGcMainDataSourceChanged; this.gcMain.GridControl.DataSourceChanged -= OnGcMainDataSourceChanged;
DataTable dataTable = gcMain.GridControl.DataSource as DataTable; DataTable dataTable = gcMain.GridControl.DataSource as DataTable;
if (dataTable != null) if (dataTable != null)
{ {
@@ -5326,10 +5327,10 @@ namespace Lskj.PubBill
sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime);
gcMain.GridControl.DataSource = null; this.gcMain.GridControl.DataSource = null;
gcMain.GridControl.DataSource = dataTable; this.gcMain.GridControl.DataSource = dataTable;
} }
this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged; this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
} }
} }