SVN r386

SVN-Revision: r386

插件库/Lskj.ProductSched/FrmProductSched.cs

@@ -1,5 +1,6 @@
 using DevExpress.Data;
 using DevExpress.Utils;
+using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid;
 using DevExpress.XtraGrid.Columns;
 using DevExpress.XtraGrid.Views.BandedGrid;
@@ -230,6 +231,7 @@ namespace Lskj.ProductiSched
                 treebandGcTop.TreeListObj.CustomDrawFooterCell += OnTreeListCustomDrawFooterCell; // 自定义绘制Footer事件
                 treebandGcTop.TreeListObj.CustomDrawColumnHeader += OnTreeListCustomDrawColumnHeader; // 自定义绘制列头事件
                 treebandGcTop.TreeListObj.ShowingEditor += OnTreeListShowingEditor;             // 编辑器显示前事件
+                treebandGcTop.TreeListObj.InvalidValueException += OnInvalidValueException; ;
             }
             else
             {
@@ -241,6 +243,7 @@ namespace Lskj.ProductiSched
                 bandGcTop.BandedView.CustomDrawFooterCell += OnCustomDrawFooterCell;
                 bandGcTop.BandedView.CustomDrawColumnHeader += OnCustomDrawColumnHeader;
                 bandGcTop.BandedView.ShowingEditor += OnShowingEditor;
+                bandGcTop.BandedView.InvalidValueException += OnInvalidValueException;
             }
             btnSave.Click += OnBtnSaveClick;
         }
@@ -772,7 +775,7 @@ namespace Lskj.ProductiSched
                             {
                                 allWidth += treeListColumn.Width;
                             }
-                          
+
                         }
                     }
                 }
@@ -920,7 +923,7 @@ namespace Lskj.ProductiSched
                     dataDetail = bandGcTop.GridControl.DataSourceTable().Copy();
                     bandGcTop.GridControl.DataSource = null;
                 }
-           
+
                 string sqlValue = DataModel.RightModuleModel.MenuSql;
                 string isweekcond = DataModel.TopModuleModel.HasReport ? "" : $"and isWeek='{typeDate}'";
                 sqlValue = $"{ReplaceHelper.ReplaceWhereCond(sqlValue)} and day >= '{dateTime.ToString("yyyy-MM-dd")}' {isweekcond}";
@@ -937,7 +940,7 @@ namespace Lskj.ProductiSched
                     OnBandedViewRowCellClick(bandGcTop.BandedView, null);
 
                 }
-        
+
             }
             string query = @"
                 SELECT 
@@ -2113,4 +2116,10 @@ namespace Lskj.ProductiSched
                     decimal coefficient = kvp.Value.Coefficient;
                     List<string> keyValues = kvp.Value.KeyValues;
 
-   
+                    DataRow newRow = dtC.NewRow();
+                    newRow["产地"] = origin;
+                    newRow["总产能"] = totalCapacity;
+
+                    // 对每个动态日期列，从 dtPlan 中查找 billdocument_id 在 keyValues 内，
+                    // 且 ShowDay 等于当前列名的记录，将 amount 累加后再乘以系数
+                    foreach (stri