SVN r833
SVN-Revision: r833
This commit is contained in:
@@ -1592,7 +1592,7 @@ namespace Lskj.Control.Model
|
||||
string defaultValue = this.SystemModel != null ? ReplaceHelper.ReplaceRowParam(this.SystemModel.maintabFocusedRow, model.DefaultValue) : model.DefaultValue;
|
||||
SetControlValue(model, defaultValue);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//智能搜索框第一次加载时手动触发
|
||||
if (changeLabelAutoGridLooks.Count > 0)
|
||||
@@ -3482,6 +3482,12 @@ namespace Lskj.Control.Model
|
||||
{
|
||||
LabelRemarkEdit labelRemarkEdit = baseControl as LabelRemarkEdit;
|
||||
labelRemarkEdit.lasttext = controlValue + "";
|
||||
ControlModel fileidmodle = this.ControlModels.Where(n => n.LabelText.Equals("原文件ID")).FirstOrDefault();
|
||||
if (fileidmodle != null)
|
||||
{
|
||||
BaseUserControl fileidControl = FindControl(fileidmodle.FieldName);
|
||||
labelRemarkEdit.changeAdd = string.IsNullOrEmpty(fileidControl.EditText);
|
||||
}
|
||||
}
|
||||
else if (baseControl is LabelPictureEdit)
|
||||
{
|
||||
@@ -4607,22 +4613,45 @@ namespace Lskj.Control.Model
|
||||
BaseUserControl productControl = FindControl(productidmodle.FieldName);
|
||||
BaseUserControl VerControl = FindControl(Vermodle.FieldName);
|
||||
BaseUserControl fileidControl = FindControl(fileidmodle.FieldName);
|
||||
DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'");
|
||||
if (dataRow != null)
|
||||
if (!string.IsNullOrEmpty(labelRemarkEdit.lasttext))//非变更新增
|
||||
{
|
||||
baseControl.EditText = dataRow["sname"] + "";
|
||||
VerControl.EditText = dataRow["Ver"] + "";
|
||||
fileidControl.EditText = dataRow["fileid"] + "";
|
||||
string IsLatest = dataRow["IsLatest"] + "";
|
||||
if (IsLatest.Equals("False"))
|
||||
if (labelRemarkEdit.changeAdd)
|
||||
{
|
||||
MessageUtil.Show("当前变更的版本低于历史版本,请检查!");
|
||||
labelRemarkEdit.EditText = string.Empty;
|
||||
DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'");
|
||||
if (dataRow != null)
|
||||
{
|
||||
baseControl.EditText = dataRow["sname"] + "";
|
||||
VerControl.EditText = dataRow["Ver"] + "";
|
||||
fileidControl.EditText = dataRow["fileid"] + "";
|
||||
string IsLatest = dataRow["IsLatest"] + "";
|
||||
if (IsLatest.Equals("False"))
|
||||
{
|
||||
MessageUtil.Show("当前变更的版本低于历史版本,请检查!");
|
||||
labelRemarkEdit.EditText = string.Empty;
|
||||
}
|
||||
}
|
||||
// 手动触发关联,有可能单据打开后直接点击新增按钮此时文本框值未改变,不会触发关联和计算
|
||||
this.SetUnionAncCalcControl(labelRemarkEdit);
|
||||
}
|
||||
}
|
||||
|
||||
// 手动触发关联,有可能单据打开后直接点击新增按钮此时文本框值未改变,不会触发关联和计算
|
||||
this.SetUnionAncCalcControl(labelRemarkEdit);
|
||||
else//变更新增
|
||||
{
|
||||
DataRow dataRow = BaseImpl.GetDataRowResult($"EXEC dbo.p_GetMaxVersionByFileName N'{updatename}'");
|
||||
if (dataRow != null)
|
||||
{
|
||||
baseControl.EditText = dataRow["sname"] + "";
|
||||
VerControl.EditText = dataRow["Ver"] + "";
|
||||
fileidControl.EditText = dataRow["fileid"] + "";
|
||||
string IsLatest = dataRow["IsLatest"] + "";
|
||||
if (IsLatest.Equals("False"))
|
||||
{
|
||||
MessageUtil.Show("当前变更的版本低于历史版本,请检查!");
|
||||
labelRemarkEdit.EditText = string.Empty;
|
||||
}
|
||||
}
|
||||
// 手动触发关联,有可能单据打开后直接点击新增按钮此时文本框值未改变,不会触发关联和计算
|
||||
this.SetUnionAncCalcControl(labelRemarkEdit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5977,30 +6006,4 @@ namespace Lskj.Control.Model
|
||||
LabelDateEdit dateEdit = controlObj as LabelDateEdit;
|
||||
value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd");
|
||||
}
|
||||
else if (controlObj is LabelCheckEdit)
|
||||
{
|
||||
LabelCheckEdit checkEdit = controlObj as LabelCheckEdit;
|
||||
value = checkEdit.EditText;
|
||||
}
|
||||
else if (controlObj is LabelComboxEdit)
|
||||
{
|
||||
LabelComboxEdit autoEdit = controlObj as LabelComboxEdit;
|
||||
value = autoEdit.EditValue;
|
||||
}
|
||||
else if (controlObj is LabelTextEdit)
|
||||
{
|
||||
LabelTextEdit textIntEdit = controlObj as LabelTextEdit;
|
||||
if (textIntEdit != null) value = string.IsNullOrEmpty(textIntEdit.EditText) ? "0" : textIntEdit.EditText;
|
||||
}
|
||||
|
||||
defaultValue = defaultValue.Replace(item, value);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
else if
|
||||
Reference in New Issue
Block a user