1
This commit is contained in:
@@ -257,7 +257,6 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
string masterSysId = this.drpMasterBox1.Value;
|
string masterSysId = this.drpMasterBox1.Value;
|
||||||
if (!string.IsNullOrWhiteSpace(masterSysId))
|
if (!string.IsNullOrWhiteSpace(masterSysId))
|
||||||
{
|
{
|
||||||
var obj = Grid1.SelectedRow.Values;
|
|
||||||
var relatePro = Funs.DB.Base_Project.FirstOrDefault(x => x.MasterSysId == masterSysId && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null)));
|
var relatePro = Funs.DB.Base_Project.FirstOrDefault(x => x.MasterSysId == masterSysId && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null)));
|
||||||
if (relatePro != null)
|
if (relatePro != null)
|
||||||
{
|
{
|
||||||
@@ -2002,10 +2001,18 @@ namespace FineUIPro.Web.ProjectData
|
|||||||
// ShowNotify($"已存在相同名称、编号的项目:({relatePro.ProjectCode}){relatePro.ProjectName}!", MessageBoxIcon.Warning);
|
// ShowNotify($"已存在相同名称、编号的项目:({relatePro.ProjectCode}){relatePro.ProjectName}!", MessageBoxIcon.Warning);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
this.txtProjectCode.Text = code;
|
//this.txtProjectCode.Text = code;
|
||||||
|
if (string.IsNullOrWhiteSpace(this.txtProjectCode.Text.Trim()))
|
||||||
|
{
|
||||||
|
this.txtProjectCode.Text = code;
|
||||||
|
}
|
||||||
this.txtJTProjectCode.Text = code;
|
this.txtJTProjectCode.Text = code;
|
||||||
//this.txtProjectName.Text = name;
|
//this.txtProjectName.Text = name;
|
||||||
this.txtShortName.Text = shortname;
|
//this.txtShortName.Text = shortname;
|
||||||
|
if (!string.IsNullOrWhiteSpace(shortname))
|
||||||
|
{
|
||||||
|
this.txtShortName.Text = shortname;
|
||||||
|
}
|
||||||
this.txtProjectAddress.Text = address;
|
this.txtProjectAddress.Text = address;
|
||||||
if (!string.IsNullOrWhiteSpace(startdate))
|
if (!string.IsNullOrWhiteSpace(startdate))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user