SVN r392

SVN-Revision: r392

插件库/Lskj.ProductSched/FrmProductSched.cs

@@ -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 = @"
@@ -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.####}";
                     }