This commit is contained in:
geh
2026-07-20 12:08:16 +08:00
parent e7354bed93
commit 4fd1a440f7
26 changed files with 2648 additions and 368 deletions
@@ -314,12 +314,45 @@ namespace FineUIPro.Web.ProjectData
string masterSysId = this.drpMasterBox1.Value;
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)));
if (relatePro != null)
{
ShowNotify($"已存在关联此主数据的项目:({relatePro.ProjectCode}{relatePro.ProjectName}", MessageBoxIcon.Warning);
}
}
else
{
string projectName = Regex.Replace(this.txtProjectName.Text, @"\s", "");
if (!string.IsNullOrWhiteSpace(projectName))
{
var applyPro = PreProjectApplyService.GetPreProjectApplyByProjectName(projectName);
if (applyPro != null)
{
if (applyPro.State == 1)
{//预立项审核通过
}
else
{
string preStr = applyPro.State == 0 ? $"{projectName}正在预立项审核中,等待{applyPro.ApproverUserName}审核!" : $"审核不通过,{applyPro.ApproverUserName}{applyPro.ApprovalDescription}";
ShowNotify(preStr, MessageBoxIcon.Warning);
return;
}
}
else
{
ShowNotify($"请选择关联集团主数据项目!", MessageBoxIcon.Warning);
return;
}
}
else
{
ShowNotify($"请选择关联集团主数据项目!", MessageBoxIcon.Warning);
return;
}
}
// else
// {
// ShowNotify($"请选择关联集团主数据项目!", MessageBoxIcon.Warning);
@@ -458,6 +491,10 @@ namespace FineUIPro.Web.ProjectData
if (getProject != null)
{
project.FromProjectId = getProject.FromProjectId;
if (string.IsNullOrWhiteSpace(project.MasterSysId) && !string.IsNullOrWhiteSpace(getProject.MasterSysId))
{
project.MasterSysId = getProject.MasterSysId;
}
}
project.ProjectId = this.ProjectId;
ProjectService.UpdateProject(project);
@@ -1132,6 +1169,17 @@ namespace FineUIPro.Web.ProjectData
}
#endregion
/// <summary>
/// 项目预立项申请
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnApply_Click(object sender, EventArgs e)
{
string projectName = this.txtProjectName.Text.Trim();
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PreProjectApply.aspx?ProjectName={0}", projectName, "项目预立项申请")));
}
}
}