From 617e746ffb5fc9b88ec1d03f4695ed795831ec68 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Tue, 25 Mar 2025 10:02:57 +0000
Subject: [PATCH] SVN r392

SVN-Revision: r392
---
 插件库/Lskj.ProductSched/FrmProductSched.cs | 33 +++++++++++----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/插件库/Lskj.ProductSched/FrmProductSched.cs b/插件库/Lskj.ProductSched/FrmProductSched.cs
index 58ca011..adf8dc8 100644
--- a/插件库/Lskj.ProductSched/FrmProductSched.cs
+++ b/插件库/Lskj.ProductSched/FrmProductSched.cs
@@ -309,7 +309,7 @@ namespace Lskj.ProductiSched
                     }
                 }
             }
-            
+
         }
 
         /// <summary>
@@ -652,7 +652,7 @@ namespace Lskj.ProductiSched
                             DateTime dateTime = labelDateEdit.TextEdit.DateTime;
                             DataRow focusedRow = bandGcTop.BandedView.GetFocusedDataRow();
                             DataTable dataDayPlan = gcRight.GridControl.DataSourceTable().Copy();
-                            if (DataModel.TopModuleModel.HasReport)UpdateRowWithDayPlan(focusedRow, dataDayPlan, dateTime);
+                            if (DataModel.TopModuleModel.HasReport) UpdateRowWithDayPlan(focusedRow, dataDayPlan, dateTime);
                         }
                     }
                 }
@@ -670,7 +670,6 @@ namespace Lskj.ProductiSched
             try
             {
                 GridDetailModel model = DataModel.RightDetailModel;
-
                 if (e.Node != null)
                 {
                     DataRow rowItem = (treebandGcTop.TreeListObj.GetDataRecordByNode(e.Node) as DataRowView)?.Row;
@@ -783,7 +782,7 @@ namespace Lskj.ProductiSched
                         {
                             foreach (TreeListColumn treeListColumn in band.Columns)
                             {
-                               if(treeListColumn.Visible) allWidth += treeListColumn.Width;
+                                if (treeListColumn.Visible) allWidth += treeListColumn.Width;
                             }
 
                         }
@@ -969,12 +968,12 @@ namespace Lskj.ProductiSched
                 MergeMainDataWithDayPlan(dataMain, dataDayPlan, dateTime, typeDate);
                 if (!TreeMultiHeader)
                 {
-                    bandGcTop.SetGridViewDataSource(dataMain);
+                    bandGcTop.BandedView.GridControl.DataSource = dataMain;
                     OnBandedViewRowCellClick(bandGcTop.BandedView, null);
                 }
-                else {
+                else
+                {
                     treebandGcTop.SetGridViewDataSource(dataMain);
-                    //treebandGcTop.TreeListObj.DataSource = dataMain;
                 }
             }
             string query = @"
@@ -1159,10 +1158,10 @@ namespace Lskj.ProductiSched
                         Caption = "",
                         OptionsBand = { AllowMove = false, AllowSize = false },
                         AppearanceHeader = {
-                Options = { UseFont = true, UseTextOptions = true },
-                Font = new Font("宋体", 9, FontStyle.Bold),
-                TextOptions = { HAlignment = HorzAlignment.Center }
-            }
+                            Options = { UseFont = true, UseTextOptions = true },
+                            Font = new Font("宋体", 9, FontStyle.Bold),
+                            TextOptions = { HAlignment = HorzAlignment.Center }
+                        }
                     };
                     bandedGridControlEx.TreeListObj.Bands.Add(dayBand);
 
@@ -1172,11 +1171,11 @@ namespace Lskj.ProductiSched
                         Width = 70,
                         Visible = false,
                         OptionsColumn = {
-                AllowMove = false,
-                AllowSize = false,
-                AllowSort = false,
-                AllowEdit = false
-            },
+                            AllowMove = false,
+                            AllowSize = false,
+                            AllowSort = false,
+                            AllowEdit = false
+                        },
                         AppearanceCell = { TextOptions = { HAlignment = HorzAlignment.Center }, Options = { UseTextOptions = true } },
                         AppearanceHeader = { TextOptions = { HAlignment = HorzAlignment.Center }, Options = { UseTextOptions = true } },
                         Format = { FormatType = FormatType.Numeric, FormatString = "{0:#,##0.####}" }
@@ -1184,6 +1183,7 @@ namespace Lskj.ProductiSched
 
                     if (bandedGridControlEx == treebandGcTop)
                     {
+                        dayColumn.AllNodesSummary = true;
                         dayColumn.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
                         dayColumn.SummaryFooterStrFormat = "{0:#,##0.####}";
                     }
@@ -1226,6 +1226,7 @@ namespace Lskj.ProductiSched
 
                     if (bandedGridControlEx == treebandGcTop)
                     {
+                        weekColumn.AllNodesSummary = true;
                         weekColumn.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
                         weekColumn.SummaryFooterStrFormat = "{0:#,##0.####}";
                     }