From 5a3e9db0fc95a5e3ede8d02f3f9147d5f66d529a Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Sat, 17 May 2025 02:39:15 +0000
Subject: [PATCH] SVN r599

SVN-Revision: r599
---
 插件库/Lskj.PubBomImport/FrmProgress.cs | 32 ++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs
index a676aa0..c8f3fae 100644
--- a/插件库/Lskj.PubBomImport/FrmProgress.cs
+++ b/插件库/Lskj.PubBomImport/FrmProgress.cs
@@ -583,9 +583,13 @@ namespace Lskj.PubBomImport
                                             childMaxBc = fileBC;
                                         }
                                     }
-                                    if (sourceBC <= childMaxBc)
+                                    if (beforeSourceCode.Equals(sourceCode) && sourceBC <= childMaxBc)//变更版次
                                     {
-                                        throw new Exception($"变更版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                        throw new Exception($"变更版本{sourceBB}的版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                    }
+                                    if (!beforeSourceCode.Equals(sourceCode) && filetable.Rows.Count > 0)//变更版本
+                                    {
+                                        throw new Exception($"变更版本{sourceBB}已存在，请进行版次变更");
                                     }
                                     StringBuilder stringBuilder = new StringBuilder();
                                     if (sourceCode.StartsWith("QD"))
@@ -680,9 +684,13 @@ namespace Lskj.PubBomImport
                                             childMaxBc = fileBC;
                                         }
                                     }
-                                    if (sourceBC <= childMaxBc)
+                                    if (beforeSourceCode.Equals(sourceCode) && sourceBC <= childMaxBc)//变更版次
                                     {
-                                        throw new Exception($"变更版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                        throw new Exception($"变更版本{sourceBB}的版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                    }
+                                    if (!beforeSourceCode.Equals(sourceCode) && filetable.Rows.Count > 0)//变更版本
+                                    {
+                                        throw new Exception($"变更版本{sourceBB}已存在，请进行版次变更");
                                     }
                                     StringBuilder insertbulider = new StringBuilder();
                                     string mxCode = BaseImpl.GetResult($"select MxFileName from FileAttachmentMapping where MaterialCode = '{topProductId}' and RelatedAttachmentName = '{beforeSourceCode}';") + "";
@@ -769,9 +777,13 @@ namespace Lskj.PubBomImport
                                             childMaxBc = fileBC;
                                         }
                                     }
-                                    if (sourceBC <= childMaxBc)
+                                    if (beforeSourceCode.Equals(sourceCode) && sourceBC <= childMaxBc)//变更版次
                                     {
-                                        throw new Exception($"变更版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                        throw new Exception($"变更版本{sourceBB}的版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                    }
+                                    if (!beforeSourceCode.Equals(sourceCode) && filetable.Rows.Count > 0)//变更版本
+                                    {
+                                        throw new Exception($"变更版本{sourceBB}已存在，请进行版次变更");
                                     }
                                     //更新或新增并备份清单
                                     int.TryParse(Model.FirstRowIndex, out int index);
@@ -964,9 +976,13 @@ namespace Lskj.PubBomImport
                                             childMaxBc = fileBC;
                                         }
                                     }
-                                    if (sourceBC <= childMaxBc)
+                                    if (beforeSourceCode.Equals(sourceCode) && sourceBC <= childMaxBc)//变更版次
                                     {
-                                        throw new Exception($"变更版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                        throw new Exception($"变更版本{sourceBB}的版次{sourceBC}小于最大版次{childMaxBc}\r\n不允许变更");
+                                    }
+                                    if (!beforeSourceCode.Equals(sourceCode) && filetable.Rows.Count > 0)//变更版本
+                                    {
+                                        throw new Exception($"变更版本{sourceBB}已存在，请进行版次变更");
                                     }
 
                                     string guid = Guid.NewGuid() + "";