diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index eea2bb5..0f10a23 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -2065,6 +2065,7 @@ namespace Lskj.PubBill
DataView dataView = dt.AsDataView();
dataView.Sort = this.BillModel.DetailOrderField;
dt = dataView.ToTable();
+ dt.AcceptChanges();
}
if (this.BillModel.DetailTreeTable)
@@ -8079,4 +8080,34 @@ namespace Lskj.PubBill
///
/// The cond.
/// The data row.
- /// true if X
\ No newline at end of file
+ /// true if XXXX, false otherwise.
+ 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;
+ }
+ }
+}
\ No newline at end of file