SVN r621

SVN-Revision: r621
2025-05-22 06:22:39 +00:00
parent df4cd2b684
commit fad840cc9c
1 changed files with 38 additions and 1 deletions
@@ -2747,6 +2747,13 @@ namespace Lskj.PubBill
                                dataTable.Columns.Add("BomMxMainProduct");
                                dataTable.Columns.Add("BomMxAddState");
                                IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
+                                var mxRows = rowsIEnumerable.Where(n => (n[afterBomFieldName] + "").Trim().StartsWith("MX"));
+                                DataRow mxRow = mxRows.FirstOrDefault();
+                                if (mxRow != null)
+                                {
+                                    mxRow["BomMxMainProduct"] = mxProductId;
+                                    mxRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
+                                }
                                foreach (string fileName in impRtnModel.FileNames)
                                {
                                    string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName).Trim();
@@ -8241,4 +8248,34 @@ namespace Lskj.PubBill
        /// </summary>
        /// <param name="cond">The cond.</param>
        /// <param name="dataRow">The data row.</param>
-        /// <returns><c>true</c> if X
+        /// <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;
+        }
+    }
+}