提交代码

This commit is contained in:
2023-12-20 15:48:05 +08:00
parent 2516cfbe69
commit f49eba5e5f
58 changed files with 8868 additions and 1411 deletions
@@ -29,6 +29,15 @@ namespace FineUIPro.Web.TestRun.TestRunManage
set { ViewState["WorkInspectId"] = value; }
}
/// <summary>
/// 工作包名称
/// </summary>
public string WorkInspectName
{
get { return (string)ViewState["WorkInspectName"]; }
set { ViewState["WorkInspectName"] = value; }
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
@@ -44,26 +53,24 @@ namespace FineUIPro.Web.TestRun.TestRunManage
/// </summary>
public void PageInit()
{
//绑定分组
var groups = Funs.DB.TestRun_TemplateItemGroup.OrderBy(x => x.Sort).ToList();
ddlGroup.DataTextField = "GroupName";
ddlGroup.DataValueField = "GroupId";
ddlGroup.DataSource = groups;
ddlGroup.DataBind();
if (!string.IsNullOrWhiteSpace(this.WorkInspectId))
{
var modelQuery = from temp in Funs.DB.TestRun_WorkInspectTemplate
join workpack in Funs.DB.TestRun_WorkPackage on temp.WorkPackId equals workpack.WorkPackId
where temp.WorkInspectId == this.WorkInspectId
select new { temp.WorkInspectId, temp.WorkInspectName, temp.GroupId, temp.Sort, temp.Remark, temp.WorkPackId, workpack.WorkPackName };
select new { temp.WorkInspectId, temp.WorkInspectName, temp.GroupName, temp.Sort, temp.Remark, temp.WorkPackId, workpack.WorkPackName };
if (modelQuery.Count() > 0)
{
var model = modelQuery.FirstOrDefault();
lblgzbmc.Text = model.WorkPackName;
txtWorkInspectName.Text = model.WorkInspectName;
ddlGroup.SelectedValue = model.GroupId;
txtRemark.Text = model.Remark;
txtSort.Text = model.Sort != null ? model.Sort.ToString() : (Funs.DB.TestRun_WorkInspectTemplate.Count(x => x.WorkPackId == this.WorkPackId) + 1).ToString();
if (!string.IsNullOrWhiteSpace(model.GroupName))
{
ddlGroup.SelectedValue = model.GroupName;
}
this.WorkInspectName = model.WorkPackName;
}
}
else
@@ -74,6 +81,11 @@ namespace FineUIPro.Web.TestRun.TestRunManage
lblgzbmc.Text = model.WorkPackName;
txtSort.Text = (Funs.DB.TestRun_WorkInspectTemplate.Count(x => x.WorkPackId == this.WorkPackId) + 1).ToString();
}
this.WorkInspectName = model.WorkPackName;
}
if (this.WorkInspectName.Trim() == "联动试车")
{
groupid.Hidden = false;
}
}
@@ -89,7 +101,14 @@ namespace FineUIPro.Web.TestRun.TestRunManage
model.WorkInspectName = txtWorkInspectName.Text;
model.Remark = txtRemark.Text;
model.WorkPackId = this.WorkPackId;
model.GroupId = ddlGroup.SelectedValue;
if (this.WorkInspectName.Trim() == "联动试车")
{
model.GroupName = ddlGroup.SelectedValue;
}
else
{
model.GroupName = this.WorkInspectName;
}
model.Sort = int.Parse(txtSort.Text);
if (string.IsNullOrWhiteSpace(this.WorkInspectId))
{