SVN r404

SVN-Revision: r404

插件库/Lskj.ProductSched/FrmProductSched.cs

@@ -2237,9 +2237,8 @@ namespace Lskj.ProductiSched
                                         DateTime dateTime;
                                         if (DataModel.columnDateMapping.TryGetValue(gridCell.Column, out dateTime))
                                         {
-
-                                            // 判断日期是否为周末（星期六或星期日）
-                                            if (dateTime.Date >= DateTime.Now.Date)
+                                            string bj_tig = bandedGridView.GetRowCellValue(gridCell.RowHandle, "bj_tig")?.ToString() ?? "";
+                                            if (!DataModel.TopModuleModel.HasReport && bj_tig != "0" && dateTime.Date >= DateTime.Now.Date)
                                             {
                                                 bandedGridView.SetRowCellValue(gridCell.RowHandle, gridCell.Column, obj);
                                             }
@@ -2277,7 +2276,6 @@ namespace Lskj.ProductiSched
                     if (valueToSet != null && MessageUtil.Show("是否替换所选单元格值？", MessageBoxButtons.YesNo) == DialogResult.Yes)
                     {
                         WaitForm.ShowForm("数据填充中");
-
                         foreach (TreeListCell cell in selectedCells)
                         {
                             if (cell.Column.OptionsColumn.AllowEdit)
@@ -2288,12 +2286,12 @@ namespace Lskj.ProductiSched
                                     string bj_tig = cell.Node.GetValue("bj_tig")?.ToString() ?? "";
                                     if (!DataModel.TopModuleModel.HasReport && bj_tig != "0" && dateTime.Date >= DateTime.Now.Date)
                                     {
+                                        treeList.SetFocusedNode(cell.Node);
                                         cell.Node.SetValue(cell.Column, valueToSet);
                                     }
                                 }
                             }
                         }
-                        treeList.PostEditor();
                         e.Handled = true;
                         WaitForm.HideForm();
                     }