SVN r755

SVN-Revision: r755

插件库/Lskj.PubBill/BillModule.cs

@@ -2924,7 +2924,7 @@ namespace Lskj.PubBill
                                 GridControlEx gridControl = xtraTabPage.Tag as GridControlEx;
                                 GridDetailModel Detailmodel = gridControl.Tag as GridDetailModel;
                                 string DetailSql = this.ControlObj.ReplaceControlValue(Detailmodel.DetailSql);
-                                DetailSql = ReplaceHelper.ReplaceRowParam(dataRow, Detailmodel.DetailSql);
+                                DetailSql = ReplaceHelper.ReplaceRowParam(dataRow, DetailSql);
                                 gridControl.SetGridViewDataSource(MainImpl.GetDataTableResult(DetailSql));
                             }
 
@@ -3741,6 +3741,10 @@ namespace Lskj.PubBill
                             if (model.DefaultValue.Contains("{#"))
                             {
                                 fieldValue = this.ControlObj.ReplaceParentControlValue(model.DefaultValue);
+                                if (fieldValue.StartsWith("@"))
+                                {
+                                    fieldValue = BaseImpl.GetDefaultValue(fieldValue);
+                                }
                                 if (!string.IsNullOrEmpty(fieldValue))
                                 {
                                     newRow[col.FieldName] = fieldValue;
@@ -8486,34 +8490,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 X