lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-10-16 09:23:49 +08:00
parent d61950897d
commit bf642afbd5
10 changed files with 1260 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
+63 -71
View File
@@ -175,7 +175,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void BindGrid(bool typechange = true)
{
var result = new List<Brid_SubInspectTermItem>();
var result = new List<PreRun_SubInspectTermItem>();
var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0];
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
var subInspectId = string.Empty;
@@ -258,7 +258,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
foreach (var item in list)
{
var model = new Brid_SubInspectTermItem();
var model = new PreRun_SubInspectTermItem();
model.TermItemId = item.TermItemId;
model.SubItemId = item.SubItemId;
model.ProjectId = item.ProjectId;
model.WorkPackId = item.WorkPackId;
@@ -272,44 +273,46 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.InspectionResults = item.InspectionResults;
model.InspectionIllustrate = item.InspectionIllustrate;
model.Sort = item.Sort;
model.isChick = true;
result.Add(model);
}
}
//获取预加载的数据
var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x => x.Sort).ToList();
if (defaultDatas.Count > 0)
else
{
int index = list.Count + 1;
foreach (var item in defaultDatas)
//获取预加载的数据
var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x => x.Sort).ToList();
if (defaultDatas.Count > 0)
{
if (list.Count(x => x.WorkInspectName == item.WorkInspectName) == 0)
int index = list.Count + 1;
foreach (var item in defaultDatas)
{
var model = new Brid_SubInspectTermItem();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = item.WorkPackId;
model.WorkInspectId = item.WorkInspectId;
model.WorkInspectName = item.WorkInspectName;
model.InstallationId = subSysModel.InstallationId;
model.ProcessesId = subSysModel.ProcessesId;
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.Sort = index + 1;
model.isChick = false;
result.Add(model);
index++;
if (list.Count(x => x.WorkInspectName == item.WorkInspectName) == 0)
{
var model = new PreRun_SubInspectTermItem();
model.TermItemId = Guid.NewGuid().ToString();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = item.WorkPackId;
model.WorkInspectId = item.WorkInspectId;
model.WorkInspectName = item.WorkInspectName;
model.InstallationId = subSysModel.InstallationId;
model.ProcessesId = subSysModel.ProcessesId;
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.Sort = index + 1;
result.Add(model);
index++;
}
}
}
}
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();
}
//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;
@@ -345,7 +348,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (e.CommandName == "Delete")
{
string rowID = e.RowID;
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(p => p.SubItemId == rowID);
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(p => p.TermItemId == rowID);
if (model != null)
{
Funs.DB.PreRun_SubInspectTermItem.DeleteOnSubmit(model);
@@ -356,7 +359,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
else
{
var list = gvList();
list.RemoveAll(x => x.SubItemId == rowID);
list.RemoveAll(x => x.TermItemId == rowID);
Grid1.DataSource = list;
Grid1.DataBind();
ShowNotify("删除成功!");
@@ -398,12 +401,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ShowNotify("请选择设备!", MessageBoxIcon.Warning);
return;
}
if (Grid1.SelectedRowIndexArray.Length == 0)
{
ShowNotify("请选择一条数据!", MessageBoxIcon.Warning);
return;
}
var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0];
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
var subInspectId = string.Empty;
@@ -412,22 +409,19 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
}
var workPackType = int.Parse(ddlWorkPackType.SelectedValue);
List<PreRun_SubInspectTerm> subTrems = new List<PreRun_SubInspectTerm>();
List<PreRun_SubInspectTermItem> subTremItems = new List<PreRun_SubInspectTermItem>();
//foreach (var item in ddbSysPiping.Values)
//{
var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
var termItems = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).ToList();
JArray mergedData = Grid1.GetMergedData();
foreach (JObject mergedRow in mergedData)
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
var workInspectId = this.Grid1.Rows[i].DataKeys[1].ToString();
if (!Grid1.SelectedRowIndexArray.Contains(i)) continue;
var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
var subItemId = this.Grid1.Rows[i].DataKeys[1].ToString();
var workInspectId = this.Grid1.Rows[i].DataKeys[2].ToString();
//获取子系统信息
var list = new List<PreRun_SubInspectTermItem>();
@@ -460,15 +454,14 @@ 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.SubInspectId == subInspectId);
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId);
if (model == null)
{
model = new PreRun_SubInspectTermItem();
model.TermItemId = Guid.NewGuid().ToString();
model.TermItemId = termItemId;
model.SubItemId = subItemId;
model.SubInspectId = subTrem.SubInspectId;
model.WorkPackId = workPackId;
@@ -500,11 +493,19 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
}
Funs.DB.PreRun_SubInspectTerm.InsertAllOnSubmit(subTrems);
Funs.DB.PreRun_SubInspectTermItem.InsertAllOnSubmit(subTremItems);
if (subTrems != null) Funs.DB.PreRun_SubInspectTerm.InsertAllOnSubmit(subTrems);
if (subTremItems.Count > 0) Funs.DB.PreRun_SubInspectTermItem.InsertAllOnSubmit(subTremItems);
Funs.DB.SubmitChanges();
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == subTrem.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0)
{
subTrem.InspectionIsAllPass = 1;
}
else
{
subTrem.InspectionIsAllPass = 0;
}
Funs.DB.SubmitChanges();
this.InitTreeMenu();
//BindGrid();
ShowNotify("保存成功!");
}
catch (Exception ex)
@@ -526,6 +527,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (subSysModel != null)
{
var model = new PreRun_SubInspectTermItem();
model.TermItemId = Guid.NewGuid().ToString();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = workPackId;
@@ -554,17 +556,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
var workInspectId = this.Grid1.Rows[i].DataKeys[1] != null ? this.Grid1.Rows[i].DataKeys[1].ToString() : string.Empty; ;
var subInspectId = this.Grid1.Rows[i].DataKeys[2] != null ? this.Grid1.Rows[i].DataKeys[2].ToString() : string.Empty;
var workPackId = this.Grid1.Rows[i].DataKeys[3].ToString();
var installationId = this.Grid1.Rows[i].DataKeys[4].ToString();
var processesId = this.Grid1.Rows[i].DataKeys[4].ToString();
var systemId = this.Grid1.Rows[i].DataKeys[4].ToString();
var subSystemId = this.Grid1.Rows[i].DataKeys[4].ToString();
var termItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
var subItemId = this.Grid1.Rows[i].DataKeys[1].ToString();
var workInspectId = this.Grid1.Rows[i].DataKeys[2] != null ? this.Grid1.Rows[i].DataKeys[2].ToString() : string.Empty; ;
var subInspectId = this.Grid1.Rows[i].DataKeys[3] != null ? this.Grid1.Rows[i].DataKeys[3].ToString() : string.Empty;
var workPackId = this.Grid1.Rows[i].DataKeys[4].ToString();
var installationId = this.Grid1.Rows[i].DataKeys[5].ToString();
var processesId = this.Grid1.Rows[i].DataKeys[6].ToString();
var systemId = this.Grid1.Rows[i].DataKeys[7].ToString();
var subSystemId = this.Grid1.Rows[i].DataKeys[8].ToString();
var model = new PreRun_SubInspectTermItem();
model = new PreRun_SubInspectTermItem();
model.TermItemId = termItemId;
model.SubItemId = subItemId;
model.SubInspectId = subInspectId;
model.WorkPackId = workPackId;
@@ -608,17 +611,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
return result;
}
/// <summary>
/// 绑定实体
/// </summary>
public class Brid_SubInspectTermItem : PreRun_SubInspectTermItem
{
/// <summary>
/// 是否选中
/// </summary>
public bool isChick { get; set; }
}
/// <summary>
/// 类型
/// </summary>