SVN r395

SVN-Revision: r395

插件库/Lskj.ProductSched/FrmProductSched.cs

@@ -2285,14 +2285,14 @@ namespace Lskj.ProductiSched
                                 if (DataModel.columnDateMapping.TryGetValue(cell.Column, out DateTime dateTime))
                                 {
                                     // 日期必须大于等于今天才允许赋值
-                                    if (dateTime.Date >= DateTime.Now.Date)
+                                    string bj_tig = cell.Node.GetValue("bj_tig")?.ToString() ?? "";
+                                    if (!DataModel.TopModuleModel.HasReport && bj_tig != "0" && dateTime.Date >= DateTime.Now.Date)
                                     {
                                         cell.Node.SetValue(cell.Column, valueToSet);
                                     }
                                 }
                             }
                         }
-
                         treeList.PostEditor();
                         e.Handled = true;
                         WaitForm.HideForm();
@@ -2363,34 +2363,4 @@ namespace Lskj.ProductiSched
 
                     // 对每个动态日期列，从 dtPlan 中查找 billdocument_id 在 keyValues 内，
                     // 且 ShowDay 等于当前列名的记录，将 amount 累加后再乘以系数
-                    foreach (string dateCol in dateColumns)
-                    {
-                        decimal sumAmount = planRows
-                            .Where(pr => keyValues.Contains(pr.BillId) && pr.ShowDay == dateCol)
-                            .Sum(pr => pr.Amount);
-                        // 乘以系数得到实际值
-                        newRow[dateCol] = sumAmount * coefficient;
-                    }
-                    dtC.Rows.Add(newRow);
-                }
-                return dtC;
-            }
-            catch (Exception)
-            {
-                return default;
-            }
-        }
-        /// <summary>
-        /// 纠正输入异常
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnInvalidValueException(object sender, InvalidValueExceptionEventArgs e)
-        {
-            if (e.Value.Equals(""))
-            {
-                e.ExceptionMode = ExceptionMode.Ignore;
-            }
-        }
-    }
-}
+                    foreach (stri