SVN r600

SVN-Revision: r600

插件库/Lskj.PubBill/BillModule.cs

@@ -328,7 +328,7 @@ namespace Lskj.PubBill
                 Task<DataRow> menuConfigTabTask = cachesDic.AddTask(this, "MenuConfigTab", new Task<DataRow>(() =>
                 {
                     DataRow dataRow = BaseImpl.GetMenuConfigTab(dynamicModel.ModuleId);
-                    if (dataRow != null) 
+                    if (dataRow != null)
                     {
                         billModel.BillSourceIds = dataRow.Table.Columns.Contains("BillSourceIds") ? (dataRow["BillSourceIds"] + "").Trim(',') : string.Empty;
                         billModel.BillFlag = dataRow.Table.Columns.Contains("BillFlag") && !string.IsNullOrEmpty(dataRow["BillFlag"] + "") ? Convert.ToInt32(dataRow["BillFlag"] + "") : -1;
@@ -2672,11 +2672,6 @@ namespace Lskj.PubBill
                                 MessageUtil.Show($"物料编码必填");
                                 return;
                             }
-                            if (impRtnModel.FileNames.Where(n => Path.GetFileName(n).Trim().StartsWith("MX")).Count() == 0)
-                            {
-                                MessageUtil.Show($"不存在MX文件");
-                                return;
-                            }
                             DataTable sourceTable = gcMain.gridControl.DataSourceTable();
                             if (sourceTable != null && impRtnModel.FileNames != null)
                             {
@@ -2699,7 +2694,6 @@ namespace Lskj.PubBill
                                 dataTable.Columns.Add("BomMxMainProduct");
                                 dataTable.Columns.Add("BomMxAddState");
                                 IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
-                                string namepattern = @"([A-Za-z]+(-[A-Za-z0-9]+)*-\d+(-\d+)*)";
                                 foreach (string fileName in impRtnModel.FileNames)
                                 {
                                     string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName).Trim();
@@ -8116,34 +8110,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