SVN r1012

SVN-Revision: r1012
This commit is contained in:
cyf
2025-09-30 06:32:28 +00:00
parent d4f95d64a9
commit abf0727509
+11 -3
View File
@@ -4691,22 +4691,30 @@ namespace Lskj.Control.Model
BaseUserControl productControl = FindControl(productidmodle.FieldName); BaseUserControl productControl = FindControl(productidmodle.FieldName);
BaseUserControl VerControl = FindControl(Vermodle.FieldName); BaseUserControl VerControl = FindControl(Vermodle.FieldName);
BaseUserControl fileidControl = FindControl(fileidmodle.FieldName); BaseUserControl fileidControl = FindControl(fileidmodle.FieldName);
if (!string.IsNullOrEmpty(labelRemarkEdit.lasttext))//变更新增 if (!string.IsNullOrEmpty(labelRemarkEdit.lasttext))//变更新增
{ {
if (labelRemarkEdit.changeAdd) if (labelRemarkEdit.changeAdd)
{ {
DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetPrevVersionByFileName N'{updatename}'"); DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetPrevVersionByFileName N'{updatename}'");
if (dataRow != null) if (dataRow != null)
{
if (!string.IsNullOrEmpty(dataRow["fileid"] + ""))
{
MessageUtil.Show("存在历史版本,无法进行变更新增操作\r\n请进行文件变更操作");
labelRemarkEdit.EditText = string.Empty;
}
else
{ {
baseControl.EditText = dataRow["sname"] + ""; baseControl.EditText = dataRow["sname"] + "";
VerControl.EditText = dataRow["Ver"] + ""; VerControl.EditText = dataRow["Ver"] + "";
fileidControl.EditText = dataRow["fileid"] + ""; //fileidControl.EditText = dataRow["fileid"] + "";
}
} }
// 手动触发关联,有可能单据打开后直接点击新增按钮此时文本框值未改变,不会触发关联和计算 // 手动触发关联,有可能单据打开后直接点击新增按钮此时文本框值未改变,不会触发关联和计算
this.SetUnionAncCalcControl(labelRemarkEdit); this.SetUnionAncCalcControl(labelRemarkEdit);
} }
} }
else//变更新增 else//普通变更
{ {
DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'"); DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'");
if (dataRow != null) if (dataRow != null)