From 388af6eb42bae45e2c2407d669c13f4eb23eb663 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Thu, 10 Jul 2025 02:41:50 +0000
Subject: [PATCH] SVN r851

SVN-Revision: r851
---
 插件库/Lskj.PubBomImport/FrmMain.cs     | 11 +++++++++--
 插件库/Lskj.PubBomImport/FrmProgress.cs | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/插件库/Lskj.PubBomImport/FrmMain.cs b/插件库/Lskj.PubBomImport/FrmMain.cs
index bb639ec..b8cbbe2 100644
--- a/插件库/Lskj.PubBomImport/FrmMain.cs
+++ b/插件库/Lskj.PubBomImport/FrmMain.cs
@@ -289,7 +289,7 @@ namespace Lskj.PubBomImport
                         this.Close();
                     }
                 }
-                else if (Model.ShowType.Equals("1"))//新增多个其它文件
+                else if (Model.ShowType.Equals("1") || Model.ShowType.Equals("11"))//新增多个其它文件
                 {
                     BomImpRtnModel bomImpRtnModel = new BomImpRtnModel()
                     {
@@ -332,7 +332,14 @@ namespace Lskj.PubBomImport
                             frmProgress.ImportTimer.Tick += (ts, te) =>
                             {
                                 frmProgress.ImportTimer.Enabled = false;
-                                frmProgress.StartImportInOtherFiles(selectRows);
+                                if (Model.ShowType.Equals("1"))
+                                {
+                                    frmProgress.StartImportInOtherFiles(selectRows);
+                                }
+                                else if (Model.ShowType.Equals("11"))
+                                {
+                                    frmProgress.StartImportInOtherFiles(selectRows, false);
+                                }
                             };
                             frmProgress.ImportTimer.Enabled = true;
                             DialogResult dialogResult = frmProgress.ShowDialog();
diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs
index ee47c9c..cb23a0c 100644
--- a/插件库/Lskj.PubBomImport/FrmProgress.cs
+++ b/插件库/Lskj.PubBomImport/FrmProgress.cs
@@ -284,7 +284,7 @@ namespace Lskj.PubBomImport
         /// Bom结构补充，新增其它文件，无版本控制
         /// </summary>
         /// <param name="dirPaths"></param>
-        public void StartImportInOtherFiles(List<DataRow> selectRows)
+        public void StartImportInOtherFiles(List<DataRow> selectRows, bool CanNotAllowSA = true)
         {
             try
             {
@@ -334,13 +334,16 @@ namespace Lskj.PubBomImport
                             }
                             else
                             {
-                                if (!bb.Equals("SA"))
+                                if (CanNotAllowSA)
                                 {
-                                    throw new Exception($"{fileInfo.Name}\r\n版本不为SA不允许新增，请进行修改");
-                                }
-                                if (bc > 0)
-                                {
-                                    throw new Exception($"{fileInfo.Name}\r\n不为0的版次不允许新增，请进行修改");
+                                    if (!bb.Equals("SA"))
+                                    {
+                                        throw new Exception($"{fileInfo.Name}\r\n版本不为SA不允许新增，请进行修改");
+                                    }
+                                    if (bc > 0)
+                                    {
+                                        throw new Exception($"{fileInfo.Name}\r\n不为0的版次不允许新增，请进行修改");
+                                    }
                                 }
                                 DataRow productRow = BaseImpl.GetDataRowResult($"select ProductId from p_productTab where ProductId = '{code}'");
                                 if (productRow == null)