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-12 10:17:08 +08:00
parent 738d0dc183
commit b451e0eebd
24 changed files with 2272 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs
+171 -72
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
}
#region 树绑定
/// <summary>
@@ -45,83 +44,66 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId
join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId
where a.ProjectId == this.CurrUser.LoginProjectId && subSystemIds.Contains(a.PreRunId) && workPackIds.Contains(c.WorkPackId)
select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName };
select new { a.PreRunId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode };
if (list.Count() > 0)
{
var selectlist = new List<SelectPropertyTechnology>();
var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping
join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId
join inspectterm in Funs.DB.PreRun_SubInspectTerm on selectproper.PropertyId equals inspectterm.PropertyTechnologyId
where subSystemIds.Contains(selectproper.SubSystemId)
select new SelectPropertyTechnology()
{
Id = proper.PropertyId,
Code = $"管道：({proper.PipingCode})",
WorkPackId = inspectterm.WorkPackId,
SubSystemId = selectproper.SubSystemId
};
if (sysPipingData.Count() > 0)
var selectlist = YscInspectItems(workPackIds, subSystemIds);
var systemIds = list.Select(x => x.SystemId).ToList();
var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId));
foreach (var itemSys in syslist)
{
selectlist.AddRange(sysPipingData);
}
var technologylist = from technology in Funs.DB.PreRun_TechnologySysPiping
join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId
join inspectterm in Funs.DB.PreRun_SubInspectTerm on selecttechnology.TechnologyId equals inspectterm.PropertyTechnologyId
where subSystemIds.Contains(selecttechnology.SubSystemId)
select new SelectPropertyTechnology()
{
Id = technology.TechnologyId,
Code = $"设备：({technology.TagNumber})",
WorkPackId = inspectterm.WorkPackId,
SubSystemId = selecttechnology.SubSystemId
};
if (technologylist.Count() > 0)
{
selectlist.AddRange(technologylist);
}
var subList = list.GroupBy(x => new { x.PreRunId, x.PreRunCode, x.PreRunName });
foreach (var item in subList)
{
TreeNode rootUnitNode = new TreeNode();//定义根节点
rootUnitNode.NodeID = item.Key.PreRunId;
rootUnitNode.Text = item.Key.PreRunName;
rootUnitNode.ToolTip = item.Key.PreRunName;
rootUnitNode.CommandName = "";
rootUnitNode.EnableClickEvent = false;
rootUnitNode.EnableExpandEvent = false;
rootNode.Nodes.Add(rootUnitNode);
rootUnitNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList();
if (worklist.Count > 0)
TreeNode rootFirstNode = new TreeNode();//定义根节点
rootFirstNode.NodeID = itemSys.PreRunId;
rootFirstNode.Text = itemSys.PreRunName;
rootFirstNode.ToolTip = itemSys.PreRunName;
rootFirstNode.CommandName = "";
rootFirstNode.EnableClickEvent = false;
rootFirstNode.EnableExpandEvent = false;
rootNode.Nodes.Add(rootFirstNode);
rootFirstNode.Expanded = true;
var subList = list.Where(g => g.SystemId == itemSys.PreRunId).GroupBy(x => new { x.PreRunId, x.SystemId, x.PreRunCode, x.PreRunName });
foreach (var item in subList)
{
foreach (var itemWork in worklist)
TreeNode rootUnitNode = new TreeNode();//定义根节点
rootUnitNode.NodeID = item.Key.PreRunId;
rootUnitNode.Text = item.Key.PreRunName;
rootUnitNode.ToolTip = item.Key.PreRunName;
rootUnitNode.CommandName = "";
rootUnitNode.EnableClickEvent = false;
rootUnitNode.EnableExpandEvent = false;
rootFirstNode.Nodes.Add(rootUnitNode);
rootUnitNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName, x.WorkPackCode }).ToList();
if (worklist.Count > 0)
{
TreeNode newNode = new TreeNode();
newNode.Text = itemWork.Key.WorkPackName;
newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId;
newNode.ToolTip = itemWork.Key.WorkPackName;
newNode.CommandName = "";
newNode.EnableClickEvent = false;
newNode.EnableExpandEvent = false;
rootUnitNode.Nodes.Add(newNode);
newNode.Expanded = true;
if (selectlist.Count > 0)
foreach (var itemWork in worklist.OrderBy(o => o.Key.WorkPackCode))
{
var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId);
foreach (var itemSelect in workselects)
TreeNode newNode = new TreeNode();
newNode.Text = itemWork.Key.WorkPackName;
newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId;
newNode.ToolTip = itemWork.Key.WorkPackName;
newNode.CommandName = "";
newNode.EnableClickEvent = false;
newNode.EnableExpandEvent = false;
rootUnitNode.Nodes.Add(newNode);
newNode.Expanded = true;
if (selectlist.Count > 0)
{
TreeNode newNodeSelect = new TreeNode();
newNodeSelect.Text = itemSelect.Code;
newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id;
newNodeSelect.ToolTip = itemSelect.Code;
newNodeSelect.CommandName = "";
newNodeSelect.EnableClickEvent = true;
newNodeSelect.EnableExpandEvent = true;
newNode.Nodes.Add(newNodeSelect);
newNodeSelect.Expanded = true;
var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId);
foreach (var itemSelect in workselects)
{
TreeNode newNodeSelect = new TreeNode();
newNodeSelect.Text = itemSelect.Code.Length > 10 ? $"{itemSelect.Code.Substring(0, 10)}......" : itemSelect.Code;
newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id;
newNodeSelect.ToolTip = itemSelect.Code;
newNodeSelect.CommandName = "";
newNodeSelect.EnableClickEvent = true;
newNodeSelect.EnableExpandEvent = true;
newNode.Nodes.Add(newNodeSelect);
newNodeSelect.Expanded = true;
}
}
}
}
}
}
@@ -147,10 +129,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
var propertytechnologyid = this.tvControlItem.SelectedNodeID.Split('|').Last();
var subInspectId = string.Empty;
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
{
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
}
//获取子系统
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.PropertyTechnologyId == propertytechnologyid && x.InspectedUser == this.CurrUser.UserId).OrderBy(x => x.Sort).ToList();
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).OrderBy(x => x.Sort).ToList();
Grid1.DataSource = list;
Grid1.DataBind();
}
@@ -187,6 +172,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == subItemId);
if (model != null)
{
//model.SubInspectId
model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value<string>("InspectionIllustrate")) ? values.Value<string>("InspectionIllustrate") : string.Empty;
if (!string.IsNullOrWhiteSpace(values.Value<string>("InspectionResults")))
{
@@ -195,6 +181,20 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Funs.DB.SubmitChanges();
}
}
var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString();
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
if (subModel != null)
{
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0)
{
subModel.InspectionIsAllPass = 1;
}
else
{
subModel.InspectionIsAllPass = 0;
}
}
Funs.DB.SubmitChanges();
BindGrid();
ShowNotify("保存成功!");
}
@@ -229,5 +229,104 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public string SubSystemId { get; set; }
}
/// <summary>
/// 已生成检查表的管道/设备
/// </summary>
private List<SelectPropertyTechnology> YscInspectItems(List<string> workPackIds, List<string> subSystemIds)
{
List<SelectPropertyTechnology> yczData = new List<SelectPropertyTechnology>();
var yscInspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => workPackIds.Contains(x.WorkPackId) && subSystemIds.Contains(x.SubSystemId)).ToList();
if (yscInspectItems.Count > 0)
{
var selectPtids = string.Join(",", yscInspectItems.ConvertAll(x => x.PropertyTechnologyId)).Split(',').ToList();
var listPros = Funs.DB.PreRun_PropertySysPiping.Where(x => selectPtids.Contains(x.PropertyId)).ToList();
var listTechno = Funs.DB.PreRun_TechnologySysPiping.Where(x => selectPtids.Contains(x.TechnologyId)).ToList();
foreach (var itemYsc in yscInspectItems)
{
var codeStr = string.Empty;
var ids = itemYsc.PropertyTechnologyId.Split(',');
var itemPros = listPros.Where(x => ids.Contains(x.PropertyId)).ToList();
if (itemPros.Count > 0)
{
codeStr = $"管道：{string.Join(",", itemPros.ConvertAll(x => x.PipingCode))}";
yczData.Add(new SelectPropertyTechnology()
{
Id = itemYsc.SubInspectId,
Code = codeStr,
WorkPackId = itemYsc.WorkPackId,
SubSystemId = itemYsc.SubSystemId
});
}
var itemTechno = listTechno.Where(x => ids.Contains(x.TechnologyId)).ToList();
if (itemTechno.Count > 0)
{
codeStr = $"设备：{string.Join(",", itemTechno.ConvertAll(x => x.TagNumber))}";
yczData.Add(new SelectPropertyTechnology()
{
Id = itemYsc.SubInspectId,
Code = codeStr,
WorkPackId = itemYsc.WorkPackId,
SubSystemId = itemYsc.SubSystemId
});
}
}
}
return yczData;
}
/// <summary>
/// 行内按钮事件
/// </summary>
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "TailTerm")
{
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
if (inspectionResults == 0)
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var tailModel = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TermItemId == termItemId);
if (tailModel != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "编辑 - ")));
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
}
}
else
{
ShowNotify("仅未通过检查项才可填写！", MessageBoxIcon.Warning);
}
}
}
/// <summary>
/// 窗口关闭
/// </summary>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
/// <summary>
/// 行绑定
/// </summary>
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
//System.Data.DataRowView row = e.DataItem as System.Data.DataRowView;
//LinkButtonField TailTerm = Grid1.FindColumn("TailTerm") as LinkButtonField;
//var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
//if (inspectionResults != 0)
//{
// TailTerm.Enabled = true;
//}
//else
//{
// TailTerm.Enabled = false;
//}
}
}
}