diff --git a/插件库/Lskj.PubBill/BillModule.Designer.cs b/插件库/Lskj.PubBill/BillModule.Designer.cs
index 4213517..f9424b5 100644
--- a/插件库/Lskj.PubBill/BillModule.Designer.cs
+++ b/插件库/Lskj.PubBill/BillModule.Designer.cs
@@ -265,10 +265,10 @@
             this.pl_treeview_detault_search.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
             this.pl_treeview_detault_search.Controls.Add(this.panelControl4);
             this.pl_treeview_detault_search.Controls.Add(this.panelControl3);
-            this.pl_treeview_detault_search.Location = new System.Drawing.Point(292, 789);
+            this.pl_treeview_detault_search.Location = new System.Drawing.Point(39, 104);
             this.pl_treeview_detault_search.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3);
             this.pl_treeview_detault_search.Name = "pl_treeview_detault_search";
-            this.pl_treeview_detault_search.Size = new System.Drawing.Size(2052, 215);
+            this.pl_treeview_detault_search.Size = new System.Drawing.Size(270, 28);
             this.pl_treeview_detault_search.TabIndex = 24;
             this.pl_treeview_detault_search.Visible = false;
             // 
@@ -281,7 +281,7 @@
             this.panelControl4.Location = new System.Drawing.Point(0, 0);
             this.panelControl4.Name = "panelControl4";
             this.panelControl4.Padding = new System.Windows.Forms.Padding(2, 4, 2, 0);
-            this.panelControl4.Size = new System.Drawing.Size(2043, 215);
+            this.panelControl4.Size = new System.Drawing.Size(206, 28);
             this.panelControl4.TabIndex = 25;
             // 
             // textEdit1
@@ -292,7 +292,7 @@
             this.textEdit1.Name = "textEdit1";
             this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("宋体", 10F);
             this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(1928, 20);
+            this.textEdit1.Size = new System.Drawing.Size(91, 20);
             this.textEdit1.TabIndex = 5;
             // 
             // barManager1
@@ -347,7 +347,7 @@
             this.lceCombobox.NullText = "";
             this.lceCombobox.ReadOnly = false;
             this.lceCombobox.Required = false;
-            this.lceCombobox.Size = new System.Drawing.Size(111, 211);
+            this.lceCombobox.Size = new System.Drawing.Size(111, 24);
             this.lceCombobox.TabIndex = 4;
             // 
             // panelControl3
@@ -355,10 +355,10 @@
             this.panelControl3.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
             this.panelControl3.Controls.Add(this.btnTreeSearch);
             this.panelControl3.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panelControl3.Location = new System.Drawing.Point(2043, 0);
+            this.panelControl3.Location = new System.Drawing.Point(206, 0);
             this.panelControl3.Name = "panelControl3";
             this.panelControl3.Padding = new System.Windows.Forms.Padding(3);
-            this.panelControl3.Size = new System.Drawing.Size(9, 215);
+            this.panelControl3.Size = new System.Drawing.Size(64, 28);
             this.panelControl3.TabIndex = 25;
             // 
             // btnTreeSearch
@@ -367,9 +367,9 @@
             this.btnTreeSearch.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnTreeSearch.Appearance.Options.UseFont = true;
             this.btnTreeSearch.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btnTreeSearch.Location = new System.Drawing.Point(-54, 3);
+            this.btnTreeSearch.Location = new System.Drawing.Point(1, 3);
             this.btnTreeSearch.Name = "btnTreeSearch";
-            this.btnTreeSearch.Size = new System.Drawing.Size(60, 209);
+            this.btnTreeSearch.Size = new System.Drawing.Size(60, 22);
             this.btnTreeSearch.TabIndex = 21;
             this.btnTreeSearch.Text = "查询";
             this.btnTreeSearch.Click += new System.EventHandler(this.OnTreeSearchClick);
diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 1cfa6ca..dae6d37 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -2878,6 +2878,7 @@ namespace Lskj.PubBill
                     AddDataColumns();
                 }
                 UpdateDynamicColumns(dateTime);
+                OnGcMainDataSourceChanged(gcMain.GridView, null);//手动刷新日期合计数据源
             }
         }
         /// <summary>
@@ -5059,13 +5060,16 @@ namespace Lskj.PubBill
                 string billNo = this.lblOrderNo.Text;
                 this.gcMain.GridView.DataSourceChanged -= OnGcMainDataSourceChanged;
                 DataTable dataTable = gcMain.GridControl.DataSource as DataTable;
-                //DataTable dataMain = dataTable.Copy();
-                string sqlValue = "select * from RD_worktimetab where 1 = 1";
-                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;
+                if (dataTable != null)
+                {
+                    //DataTable dataMain = dataTable.Copy();
+                    string sqlValue = "select * from RD_worktimetab where 1 = 1";
+                    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.GridView.DataSourceChanged += OnGcMainDataSourceChanged;
             }
         }