提交试车代码
This commit is contained in:
@@ -307,12 +307,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
}
|
||||
Grid1.DataSource = result;
|
||||
Grid1.DataBind();
|
||||
//if (result.Count(x => x.isChick) > 0)
|
||||
//{
|
||||
// //默认选中行
|
||||
// var checkids = result.Where(x => x.isChick).Select(a => a.SubItemId);
|
||||
// Grid1.SelectedRowIDArray = checkids.ToArray();
|
||||
//}
|
||||
//检查人绑定
|
||||
var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user;
|
||||
|
||||
@@ -351,6 +345,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(p => p.TermItemId == rowID);
|
||||
if (model != null)
|
||||
{
|
||||
if (model.InspectionResults != null)
|
||||
{
|
||||
ShowNotify("已存在检查结果,无法删除!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
Funs.DB.PreRun_SubInspectTermItem.DeleteOnSubmit(model);
|
||||
Funs.DB.SubmitChanges();
|
||||
BindGrid();
|
||||
@@ -413,6 +412,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
List<PreRun_SubInspectTermItem> subTremItems = new List<PreRun_SubInspectTermItem>();
|
||||
var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
|
||||
var termItems = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).ToList();
|
||||
if (termItems.Count > 0 && termItems.Count(x => x.InspectionResults == null) == 0)
|
||||
{
|
||||
ShowNotify("所有检查项已存在检查结果,无法保存!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
JArray mergedData = Grid1.GetMergedData();
|
||||
foreach (JObject mergedRow in mergedData)
|
||||
{
|
||||
@@ -454,7 +458,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
subTrem.Subcontractor = ddlfbs.SelectedValue;
|
||||
subTrem.Contractor = ddlcbs.SelectedValue;
|
||||
subTrem.Supervision = ddljl.SelectedValue;
|
||||
subTrem.Owner = ddlyz.SelectedValue;
|
||||
subTrem.Owner = ddlyz.SelectedValue;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId);
|
||||
@@ -522,6 +526,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
var list = gvList();
|
||||
var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0];
|
||||
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
|
||||
var subInspectId = string.Empty;
|
||||
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
|
||||
{
|
||||
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
|
||||
var termItems = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).ToList();
|
||||
if (termItems.Count(x => x.InspectionResults == null) == 0)
|
||||
{
|
||||
ShowNotify("所有检查项已存在检查结果,无法新增!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
}
|
||||
//获取子系统
|
||||
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
|
||||
if (subSysModel != null)
|
||||
|
||||
Reference in New Issue
Block a user