提交代码

This commit is contained in:
2024-01-05 09:40:50 +08:00
parent 97015c50ec
commit ba149177c6
65 changed files with 9695 additions and 244 deletions
@@ -35,13 +35,74 @@ namespace FineUIPro.Web.TestRun.TestRunManage
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var userTermItems = from a in Funs.DB.TestRun_TermItemInspectedUser
join b in Funs.DB.TestRun_SubInspectTermItem on a.TermItemId equals b.TermItemId
where b.InspectedUser == this.CurrUser.UserId && a.ProjectId == this.CurrUser.LoginProjectId
select new { a, b };
join b in Funs.DB.TestRun_SubInspectTermItem on a.TermItemId equals b.TermItemId
where a.InspectedUser == this.CurrUser.UserId && a.ProjectId == this.CurrUser.LoginProjectId
select new { a, b };
if (userTermItems.Count() == 0) return;
var systemIds = userTermItems.Select(x => x.b.SystemId);
var workPackIds = userTermItems.Select(x => x.b.WorkPackId);
var list = from a in Funs.DB.PreRun_SysDevice
join b in Funs.DB.TestRun_SubSysWorkPackage on a.PreRunId equals b.SystemId
join c in Funs.DB.TestRun_WorkPackage on b.WorkPackId equals c.WorkPackId
where a.ProjectId == this.CurrUser.LoginProjectId && systemIds.Contains(a.PreRunId) && workPackIds.Contains(c.WorkPackId)
select new { a.PreRunId, a.ProcessesId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode };
if (list.Count() > 0)
{
var ids = list.Select(x => x.ProcessesId).ToList();
ids.AddRange(list.Select(x => x.PreRunId).ToList());
ids = ids.Distinct().ToList();
var syslist = Funs.DB.PreRun_SysDevice.Where(x => ids.Contains(x.PreRunId)).ToList();
if (syslist.Count > 0)
{
var oneIds = syslist.ConvertAll(x => x.ProcessesId).Distinct().ToList();
foreach (var itemOne in oneIds)
{
var itemOneModel = syslist.FirstOrDefault(x => x.PreRunId == itemOne);
TreeNode rootOneNode = new TreeNode();
rootOneNode.NodeID = itemOneModel.PreRunId;
rootOneNode.Text = itemOneModel.PreRunName;
rootOneNode.ToolTip = itemOneModel.PreRunName;
rootOneNode.CommandName = "";
rootOneNode.EnableClickEvent = false;
rootOneNode.EnableExpandEvent = false;
rootNode.Nodes.Add(rootOneNode);
rootOneNode.Expanded = true;
var subTwoList = syslist.Where(g => g.ParentId == itemOneModel.PreRunId).GroupBy(x => new { x.PreRunId, x.ProcessesId, x.PreRunCode, x.PreRunName });
foreach (var itemTwo in subTwoList)
{
TreeNode rootTwoNode = new TreeNode();
rootTwoNode.NodeID = itemTwo.Key.PreRunId;
rootTwoNode.Text = itemTwo.Key.PreRunName;
rootTwoNode.ToolTip = itemTwo.Key.PreRunName;
rootTwoNode.CommandName = "";
rootTwoNode.EnableClickEvent = false;
rootTwoNode.EnableExpandEvent = false;
rootOneNode.Nodes.Add(rootTwoNode);
rootTwoNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == itemTwo.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName, x.WorkPackCode }).ToList();
if (worklist.Count > 0)
{
foreach (var itemWork in worklist.OrderBy(o => o.Key.WorkPackCode))
{
TreeNode newNode = new TreeNode();
newNode.Text = itemWork.Key.WorkPackName;
newNode.NodeID = itemWork.Key.WorkPackId + "|" + itemTwo.Key.PreRunId;
newNode.ToolTip = itemWork.Key.WorkPackName;
newNode.CommandName = "";
newNode.Expanded = true;
newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
rootTwoNode.Nodes.Add(newNode);
}
}
}
}
}
}
}
/// <summary>
@@ -62,29 +123,21 @@ namespace FineUIPro.Web.TestRun.TestRunManage
public void BindGrid(bool istail = false)
{
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
var subInspectId = string.Empty;
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
{
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
lblCodeStr.Text = this.tvControlItem.SelectedNode.ToolTip;
}
else
{
lblCodeStr.Text = string.Empty;
}
//获取子系统
var data = from termitem in Funs.DB.PreRun_SubInspectTermItem
join b in Funs.DB.PreRun_InspectTailTerm on termitem.TermItemId equals b.TermItemId into t
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last();
var data = from termuser in Funs.DB.TestRun_TermItemInspectedUser
join termitem in Funs.DB.TestRun_SubInspectTermItem on termuser.TermItemId equals termitem.TermItemId
join b in Funs.DB.TestRun_InspectTailTerm.Where(x => x.InspectUser == this.CurrUser.UserId) on termitem.TermItemId equals b.TermItemId into t
from tail in t.DefaultIfEmpty()
where termitem.SubInspectId == subInspectId
&& termitem.InspectedUser == this.CurrUser.UserId
group termitem by new { termitem.TermItemId, termitem.SubItemId, termitem.SubInspectId, termitem.WorkPackId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName, termitem.InstallationId, termitem.ProcessesId, termitem.SystemId, termitem.SubSystemId, termitem.InspectedUser, termitem.InspectionResults, termitem.InspectionIllustrate, termitem.Subcontractor, termitem.Contractor, termitem.Supervision, termitem.Owner, termitem.SubcontractorIsPass, termitem.ContractorIsPass, termitem.SupervisionIsPass, termitem.OwnerIsPass, termitem.SubcontractorRemark, termitem.ContractorRemark, termitem.SupervisionRemark, termitem.OwnerRemark, termitem.WorkPackType, termitem.PropertyTechnologyId, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 } into gt
where termitem.WorkPackId == workPackId
&& termitem.SystemId == subSystemId
&& termuser.InspectedUser == this.CurrUser.UserId
group new { termitem.TermItemId, termitem.SubInspectId, termitem.WorkPackId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName, termitem.InstallationId, termitem.ProcessesId, termitem.SystemId, termitem.InspectedUser, termuser.InspectionResults, termuser.InspectionIllustrate, termitem.Subcontractor, termitem.Contractor, termitem.Supervision, termitem.Owner, termitem.SubcontractorIsPass, termitem.ContractorIsPass, termitem.SupervisionIsPass, termitem.OwnerIsPass, termitem.SubcontractorRemark, termitem.ContractorRemark, termitem.SupervisionRemark, termitem.OwnerRemark, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 }
by new { termitem.TermItemId, termitem.SubInspectId, termitem.WorkPackId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName, termitem.InstallationId, termitem.ProcessesId, termitem.SystemId, termitem.InspectedUser, termuser.InspectionResults, termuser.InspectionIllustrate, termitem.Subcontractor, termitem.Contractor, termitem.Supervision, termitem.Owner, termitem.SubcontractorIsPass, termitem.ContractorIsPass, termitem.SupervisionIsPass, termitem.OwnerIsPass, termitem.SubcontractorRemark, termitem.ContractorRemark, termitem.SupervisionRemark, termitem.OwnerRemark, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 } into gt
orderby gt.Key.Sort
select new TermItemBridDto()
{
TermItemId = gt.Key.TermItemId,
SubItemId = gt.Key.SubItemId,
SubInspectId = gt.Key.SubInspectId,
WorkPackId = gt.Key.WorkPackId,
ProjectId = gt.Key.ProjectId,
@@ -93,7 +146,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
InstallationId = gt.Key.InstallationId,
ProcessesId = gt.Key.ProcessesId,
SystemId = gt.Key.SystemId,
SubSystemId = gt.Key.SubSystemId,
InspectedUser = gt.Key.InspectedUser,
InspectionResults = gt.Key.InspectionResults,
InspectionIllustrate = gt.Key.InspectionIllustrate,
@@ -109,8 +161,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
ContractorRemark = gt.Key.ContractorRemark,
SupervisionRemark = gt.Key.SupervisionRemark,
OwnerRemark = gt.Key.OwnerRemark,
WorkPackType = gt.Key.WorkPackType,
PropertyTechnologyId = gt.Key.PropertyTechnologyId,
Remark = gt.Key.Remark,
AddUser = gt.Key.AddUser,
AddTime = gt.Key.AddTime,
@@ -118,7 +168,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
IsTailTerm = gt.Key.IsTailTerm
};
var list = data.ToList();
//list = list.OrderBy(o => o.Sort).ToList();
if (istail)
{
JArray mergedData = Grid1.GetMergedData();
@@ -158,8 +207,8 @@ namespace FineUIPro.Web.TestRun.TestRunManage
{
try
{
var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString();
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && (x.SubcontractorIsPass != null || x.ContractorIsPass != null || x.SupervisionIsPass != null || x.OwnerIsPass != null)) > 0)
var subInspectId = this.Grid1.Rows[0].DataKeys[2].ToString();
if (Funs.DB.TestRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && (x.SubcontractorIsPass != null || x.ContractorIsPass != null || x.SupervisionIsPass != null || x.OwnerIsPass != null)) > 0)
{
ShowNotify("已进入检查表流转,无法修改检查结果!", MessageBoxIcon.Warning);
return;
@@ -170,10 +219,10 @@ namespace FineUIPro.Web.TestRun.TestRunManage
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 termItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
if (values.Value<string>("InspectionResults") == "0")
{
if (Funs.DB.PreRun_InspectTailTerm.Count(x => x.TermItemId == subItemId) == 0)
if (Funs.DB.TestRun_InspectTailTerm.Count(x => x.TermItemId == termItemId) == 0)
{
ShowNotify("未通过的检查项请填写尾项!", MessageBoxIcon.Warning);
return;
@@ -185,9 +234,9 @@ namespace FineUIPro.Web.TestRun.TestRunManage
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 termItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
//获取子系统信息
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == subItemId);
var model = Funs.DB.TestRun_TermItemInspectedUser.FirstOrDefault(x => x.TermItemId == termItemId && x.InspectedUser == this.CurrUser.UserId);
if (model != null)
{
model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value<string>("InspectionIllustrate")) ? values.Value<string>("InspectionIllustrate") : string.Empty;
@@ -195,13 +244,27 @@ namespace FineUIPro.Web.TestRun.TestRunManage
{
model.InspectionResults = int.Parse(values.Value<string>("InspectionResults"));
}
//检查项表
var subItemModel = Funs.DB.TestRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId);
if (subItemModel != null)
{
if (Funs.DB.TestRun_TermItemInspectedUser.Count(x => x.InspectionResults.GetValueOrDefault() != 1 && x.TermItemId == model.TermItemId && x.InspectedUser != model.InspectedUser) == 0 && model.InspectionResults == 1)
{
subItemModel.AllUserInspectionPass = 1;
}
else
{
subItemModel.AllUserInspectionPass = 0;
}
}
Funs.DB.SubmitChanges();
}
}
//检查表
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)
if (Funs.DB.TestRun_TermItemInspectedUser.Count(x => x.SubInspectId == subInspectId && x.InspectionResults.GetValueOrDefault() != 1) == 0)
{
subModel.InspectionIsAllPass = 1;
}
@@ -210,6 +273,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
subModel.InspectionIsAllPass = 0;
}
}
Funs.DB.SubmitChanges();
BindGrid();
ShowNotify("保存成功!");
@@ -222,29 +286,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
#endregion
/// <summary>
/// 子系统选择的管道/设备
/// </summary>
public class SelectPropertyTechnology
{
/// <summary>
/// 主键
/// </summary>
public string Id { get; set; }
/// <summary>
/// 编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 工作包主键
/// </summary>
public string WorkPackId { get; set; }
/// <summary>
/// 子系统主键
/// </summary>
public string SubSystemId { get; set; }
}
/// <summary>
/// 尾项数据绑定实体
/// </summary>
@@ -291,10 +332,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
/// </summary>
public string SystemId { get; set; }
/// <summary>
/// 子系统主键
/// </summary>
public string SubSystemId { get; set; }
/// <summary>
/// 检查人主键
/// </summary>
public string InspectedUser { get; set; }
@@ -355,14 +392,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
/// </summary>
public string OwnerRemark { get; set; }
/// <summary>
/// 类型0=全部1=管道2=设备
/// </summary>
public int? WorkPackType { get; set; }
/// <summary>
/// 管道或工艺设备主键
/// </summary>
public string PropertyTechnologyId { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
@@ -384,52 +413,6 @@ namespace FineUIPro.Web.TestRun.TestRunManage
public int IsTailTerm { 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>
@@ -439,7 +422,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
if (e.CommandName == "TailTerm")
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
var inspectionResults = Grid1.DataKeys[e.RowIndex][1] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()) : -1;
if (inspectionResults == 0)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
@@ -462,10 +445,10 @@ namespace FineUIPro.Web.TestRun.TestRunManage
if (e.CommandName == "TailTermUpdate")
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
var inspectionResults = Grid1.DataKeys[e.RowIndex][1] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()) : -1;
if (inspectionResults == 0)
{
var tails = Funs.DB.PreRun_InspectTailTerm.Where(x => x.TermItemId == termItemId).ToList();
var tails = Funs.DB.TestRun_InspectTailTerm.Where(x => x.TermItemId == termItemId && x.InspectUser == this.CurrUser.UserId).ToList();
if (tails.Count > 0)
{
if (tails.Count(x => x.ApproveState == 0) == 0)
@@ -509,7 +492,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
/// </summary>
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
var isTailTerm = Grid1.DataKeys[e.RowIndex][4].ToString();
var isTailTerm = Grid1.DataKeys[e.RowIndex][3].ToString();
LinkButtonField TailTermUpdate = Grid1.FindColumn("TailTermUpdate") as LinkButtonField;
if (isTailTerm == "0")
{
@@ -526,7 +509,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
{
if (!string.IsNullOrWhiteSpace(hidTailTermId.Text))
{
var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == hidTailTermId.Text);
var model = Funs.DB.TestRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == hidTailTermId.Text);
if (model != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", hidTailTermId.Text, model.TermItemId, "编辑 - ")));