SVN r259

SVN-Revision: r259

插件库/Lskj.PubBill/BillModule.cs

@@ -1001,6 +1001,7 @@ namespace Lskj.PubBill
                     _detailColumns = BillImpl.GetDetailColumns(this.SysModel.ModuleCode, true);//初始化单据明细列
                 }
             }
+            this.gcMain.DisableFieldSources = this.BillModel.DisableFieldSources;
             this.gcMain.Model = this.SysModel;
             this.gcMain.ParentControl = this.ControlObj;//把主表控件赋给 单据主表控件、基础档案查询条件控件等等
             this.gcMain.SetEditColumns(_detailColumns, GridCustomColumnStruct.BillDetailGridView + this.BillModel.FormKey);//设置可编辑列
@@ -7302,37 +7303,4 @@ namespace Lskj.PubBill
         /// </summary>
         /// <param name="cond">The cond.</param>
         /// <param name="dataRow">The data row.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
-        private bool ValidateCond(string cond, DataRow dataRow)
-        {
-            bool result = false;
-            string condition = cond;
-            try
-            {
-                if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确
-                cond = ReplaceHelper.ReplaceRowParam(dataRow, cond);
-                if (cond.StartsWith("@") || cond.StartsWith("!"))
-                {
-                    result = "1".Equals(BaseImpl.GetDefaultValue(cond));
-                }
-                else if (dataRow == null)
-                {
-                    result = ReplaceHelper.EvalCond(cond);
-                }
-                else
-                {
-                    result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
-                }
-                return result;
-            }
-            catch (Exception ex)
-            {
-
-            }
-            return result;
-
-        }
-
-
-    }
-}
+        /// <returns><c>true</c> if XXXX, <