SVN r738

SVN-Revision: r738

插件库/Lskj.PubBomImportNew/DllBaseClass.cs

@@ -69,10 +69,10 @@ namespace Lskj.PubBomImportNew
         /// </summary>
         public string stratRowHand = "";
         /// <summary>
-        /// 终止行号
+        /// 终止条件
         /// </summary>
         public string endRowHand = "";
-      
+
         public DynamicBomImportNew(string[] args)
             : base(args)
         {

插件库/Lskj.PubBomImportNew/FrmMain2.cs

@@ -1486,6 +1486,7 @@ namespace Lskj.PubBomImportNew
                 }
                 InitializeValueGrid();
                 bool AutoImportCal = SystemInfo.Instance.AutoImportCal;//是否执行计算公式
+                bool isBreak = false;
                 for (int i = startRow; i <= sheet.LastRowNum; i++)
                 {
                     ToAssignment = true;
@@ -1737,6 +1738,15 @@ namespace Lskj.PubBomImportNew
                                 throw;
                             }
                         }
+                        if (ReplaceHelper.ReplaceRowParamCond(dataRow, Model.endRowHand.Replace(colDataRow["excelFieldName"] + "", columnName)))
+                        {
+                            isBreak = true;
+                            break;
+                        }
+                    }
+                    if (isBreak)
+                    {
+                        break;
                     }
                     table.Rows.Add(dataRow);
                     count += 1;