From 4eea773241110d56961cb19a40e922231d9e55a4 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Wed, 21 May 2025 09:52:29 +0000
Subject: [PATCH] SVN r615

SVN-Revision: r615
---
 插件库/Lskj.PubBill/BillModule.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 5cc6e3c..9df52cd 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -466,6 +466,7 @@ namespace Lskj.PubBill
                     }));
                     Task<Hashtable> sourcesTask = cachesDic.AddTask(this, "Sources", new Task<Hashtable>(() =>
                     {
+                        DataRow menuConfigRow = menuConfigTabTask.Result;
                         return BillImpl.GetSources(dynamicModel.ModuleCode, billModel.BillSourceIds);//获取单据来源
                     }));
                     cachesDic.AddTask(tb_buttom, "DynamicModel", dynamicModelTask);
@@ -1114,7 +1115,7 @@ namespace Lskj.PubBill
             {
                 this.gcMain.GridView.RowCellClick += OngcMainRowCellClick;
             }
-            this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged;
+            this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
         }
 
 
@@ -1235,10 +1236,10 @@ namespace Lskj.PubBill
         /// <summary>
         /// 新增汇总数据（日期修改后）
         /// </summary>
-        private void UpdateSummaryData(DataTable table = null) 
+        private void UpdateSummaryData(DataTable table = null)
         {
             DataTable dataTable = new DataTable();
-            if (table != null) 
+            if (table != null)
             {
                 dataTable = table;
             }
@@ -1268,7 +1269,7 @@ namespace Lskj.PubBill
                 //树表格
                 gcMain.AddHeadquarters(dataRow);
             }
-            else if(MultiLineSummary)
+            else if (MultiLineSummary)
             {
                 MultiLineSummary = false;
                 //清空新加的汇总列
@@ -3243,7 +3244,7 @@ namespace Lskj.PubBill
                             }
                         }
 
-                        if (table != null )
+                        if (table != null)
                         {
                             UpdateSummaryData(table);
                         }
@@ -4926,7 +4927,7 @@ namespace Lskj.PubBill
                 {
                     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.RefreshSource(GetBillSourceManager());
                         this.RefreshSelectedSource();
@@ -5317,7 +5318,7 @@ namespace Lskj.PubBill
             if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime)
             {
                 string billNo = this.lblOrderNo.Text;
-                this.gcMain.GridView.DataSourceChanged -= OnGcMainDataSourceChanged;
+                this.gcMain.GridControl.DataSourceChanged -= OnGcMainDataSourceChanged;
                 DataTable dataTable = gcMain.GridControl.DataSource as DataTable;
                 if (dataTable != null)
                 {
@@ -5326,10 +5327,10 @@ namespace Lskj.PubBill
                     sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
                     DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
                     MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime);
-                    gcMain.GridControl.DataSource = null;
-                    gcMain.GridControl.DataSource = dataTable;
+                    this.gcMain.GridControl.DataSource = null;
+                    this.gcMain.GridControl.DataSource = dataTable;
                 }
-                this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged;
+                this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
             }
         }