From abf0727509ba436a72a20a5b6dabf5652222974a Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Tue, 30 Sep 2025 06:32:28 +0000
Subject: [PATCH] SVN r1012

SVN-Revision: r1012
---
 插件库/Lskj.Control/Model/MyControl.cs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs
index 85e1a60..310ff4e 100644
--- a/插件库/Lskj.Control/Model/MyControl.cs
+++ b/插件库/Lskj.Control/Model/MyControl.cs
@@ -4691,22 +4691,30 @@ namespace Lskj.Control.Model
                 BaseUserControl productControl = FindControl(productidmodle.FieldName);
                 BaseUserControl VerControl = FindControl(Vermodle.FieldName);
                 BaseUserControl fileidControl = FindControl(fileidmodle.FieldName);
-                if (!string.IsNullOrEmpty(labelRemarkEdit.lasttext))//非变更新增
+                if (!string.IsNullOrEmpty(labelRemarkEdit.lasttext))//变更新增
                 {
                     if (labelRemarkEdit.changeAdd)
                     {
                         DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetPrevVersionByFileName N'{updatename}'");
                         if (dataRow != null)
                         {
-                            baseControl.EditText = dataRow["sname"] + "";
-                            VerControl.EditText = dataRow["Ver"] + "";
-                            fileidControl.EditText = dataRow["fileid"] + "";
+                            if (!string.IsNullOrEmpty(dataRow["fileid"] + ""))
+                            {
+                                MessageUtil.Show("存在历史版本，无法进行变更新增操作\r\n请进行文件变更操作");
+                                labelRemarkEdit.EditText = string.Empty;
+                            }
+                            else
+                            {
+                                baseControl.EditText = dataRow["sname"] + "";
+                                VerControl.EditText = dataRow["Ver"] + "";
+                                //fileidControl.EditText = dataRow["fileid"] + "";
+                            }
                         }
                         // 手动触发关联，有可能单据打开后直接点击新增按钮此时文本框值未改变，不会触发关联和计算
                         this.SetUnionAncCalcControl(labelRemarkEdit);
                     }
                 }
-                else//变更新增
+                else//普通变更
                 {
                     DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'");
                     if (dataRow != null)