修改试车
This commit is contained in:
@@ -38,101 +38,78 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
rootNode.ToolTip = "";
|
||||
rootNode.EnableClickEvent = true;
|
||||
this.tvControlItem.Nodes.Add(rootNode);
|
||||
|
||||
//var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).ToList();
|
||||
//if (userSubInspects.Count == 0) return;
|
||||
//var subSystemIds = userSubInspects.ConvertAll(x => x.SubSystemId);
|
||||
//var workPackIds = userSubInspects.ConvertAll(x => x.WorkPackId);
|
||||
|
||||
var list = from a in Funs.DB.PreRun_SysDevice
|
||||
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
|
||||
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 subSystemIds = list.Select(x => x.PreRunId).ToList();
|
||||
var workPackIds = list.Select(x => x.WorkPackId).ToList();
|
||||
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.Expanded = true;
|
||||
var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId);
|
||||
if (workselects.Count() > 0)
|
||||
{
|
||||
newNode.EnableClickEvent = false;
|
||||
newNode.EnableExpandEvent = false;
|
||||
rootUnitNode.Nodes.Add(newNode);
|
||||
foreach (var itemSelect in workselects)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
else
|
||||
foreach (var itemWork in worklist.OrderBy(o => o.Key.WorkPackCode))
|
||||
{
|
||||
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.Expanded = true;
|
||||
newNode.EnableClickEvent = true;
|
||||
newNode.EnableExpandEvent = true;
|
||||
rootUnitNode.Nodes.Add(newNode);
|
||||
var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId);
|
||||
if (workselects.Count() > 0)
|
||||
{
|
||||
newNode.EnableExpandEvent = false;
|
||||
rootUnitNode.Nodes.Add(newNode);
|
||||
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;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
newNode.EnableClickEvent = true;
|
||||
newNode.EnableExpandEvent = true;
|
||||
rootUnitNode.Nodes.Add(newNode);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -145,27 +122,38 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
/// </summary>
|
||||
public void PageInit()
|
||||
{
|
||||
var userList = Funs.DB.Sys_User;
|
||||
if (userList.Count() > 0)
|
||||
//检查人绑定
|
||||
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;
|
||||
var userids = new List<string>() { Const.sysglyId, Const.hfnbdId, Const.sedinId };
|
||||
var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId));
|
||||
var users = userList.ToList();
|
||||
if (addUserList.Count() > 0)
|
||||
{
|
||||
users.AddRange(addUserList);
|
||||
}
|
||||
if (users.Count() > 0)
|
||||
{
|
||||
ddlfbs.DataTextField = "UserName";
|
||||
ddlfbs.DataValueField = "UserId";
|
||||
ddlfbs.DataSource = userList;
|
||||
ddlfbs.DataSource = users;
|
||||
ddlfbs.DataBind();
|
||||
|
||||
ddlcbs.DataTextField = "UserName";
|
||||
ddlcbs.DataValueField = "UserId";
|
||||
ddlcbs.DataSource = userList;
|
||||
ddlcbs.DataSource = users;
|
||||
ddlcbs.DataBind();
|
||||
|
||||
ddljl.DataTextField = "UserName";
|
||||
ddljl.DataValueField = "UserId";
|
||||
ddljl.DataSource = userList;
|
||||
ddljl.DataSource = users;
|
||||
ddljl.DataBind();
|
||||
|
||||
ddlyz.DataTextField = "UserName";
|
||||
ddlyz.DataValueField = "UserId";
|
||||
ddlyz.DataSource = userList;
|
||||
ddlyz.DataSource = users;
|
||||
ddlyz.DataBind();
|
||||
}
|
||||
}
|
||||
@@ -188,16 +176,31 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
public void BindGrid(bool typechange = true)
|
||||
{
|
||||
var result = new List<Brid_SubInspectTermItem>();
|
||||
var sysPipingData = new List<SelectPropertyTechnology>();
|
||||
var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0];
|
||||
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
|
||||
var propertytechnologyid = string.Empty;
|
||||
var subInspectId = string.Empty;
|
||||
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
|
||||
{
|
||||
propertytechnologyid = this.tvControlItem.SelectedNodeID.Split('|').Last();
|
||||
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
|
||||
}
|
||||
if (typechange)
|
||||
{
|
||||
var propertyTechnologyIds = string.Empty;
|
||||
var selectStr = string.Empty;
|
||||
|
||||
var inspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).ToList();
|
||||
if (!string.IsNullOrWhiteSpace(subInspectId))
|
||||
{
|
||||
var selectItem = inspectItems.FirstOrDefault(x => x.SubInspectId == subInspectId);
|
||||
if (selectItem != null)
|
||||
{
|
||||
selectStr = selectItem.PropertyTechnologyId;
|
||||
}
|
||||
inspectItems.RemoveAll(x => x.SubInspectId == subInspectId);
|
||||
}
|
||||
|
||||
if (inspectItems.Count > 0) propertyTechnologyIds = string.Join(",", inspectItems.ConvertAll(x => x.PropertyTechnologyId));
|
||||
|
||||
var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId);
|
||||
if (workPage != null)
|
||||
{
|
||||
@@ -222,54 +225,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
ddlWorkPackType.SelectedValue = "2";
|
||||
}
|
||||
//加载数据
|
||||
if (ddlWorkPackType.SelectedValue == "1")
|
||||
{
|
||||
var sysData = from proper in Funs.DB.PreRun_PropertySysPiping
|
||||
join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId
|
||||
where selectproper.SubSystemId == subSystemId
|
||||
select new SelectPropertyTechnology()
|
||||
{
|
||||
Id = proper.PropertyId,
|
||||
Code = $"管道：({proper.PipingCode})"
|
||||
};
|
||||
if (sysData.Count() > 0)
|
||||
{
|
||||
sysPipingData = sysData.ToList();
|
||||
cbSysPiping.DataTextField = "Code";
|
||||
cbSysPiping.DataValueField = "Id";
|
||||
cbSysPiping.DataSource = sysPipingData;
|
||||
cbSysPiping.DataBind();
|
||||
}
|
||||
else
|
||||
{
|
||||
cbSysPiping.Items.Clear();
|
||||
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var sysData = from technology in Funs.DB.PreRun_TechnologySysPiping
|
||||
join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId
|
||||
where selecttechnology.SubSystemId == subSystemId
|
||||
select new SelectPropertyTechnology()
|
||||
{
|
||||
Id = technology.TechnologyId,
|
||||
Code = $"设备：({technology.TagNumber})"
|
||||
};
|
||||
if (sysData.Count() > 0)
|
||||
{
|
||||
sysPipingData = sysData.ToList();
|
||||
cbSysPiping.DataTextField = "Code";
|
||||
cbSysPiping.DataValueField = "Id";
|
||||
cbSysPiping.DataSource = sysPipingData;
|
||||
cbSysPiping.DataBind();
|
||||
}
|
||||
else
|
||||
{
|
||||
cbSysPiping.Items.Clear();
|
||||
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));
|
||||
}
|
||||
}
|
||||
PipingBrid(ddlWorkPackType.SelectedValue, subSystemId, propertyTechnologyIds, selectStr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -277,7 +233,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
|
||||
//获取主表数据
|
||||
var workPackType = int.Parse(ddlWorkPackType.SelectedValue);
|
||||
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.WorkPackType == workPackType && x.PropertyTechnologyId == propertytechnologyid);
|
||||
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
|
||||
if (subModel != null)
|
||||
{
|
||||
if (subModel.WorkPackType != null)
|
||||
@@ -285,12 +241,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
ddlWorkPackType.SelectedValue = subModel.WorkPackType.ToString();
|
||||
ddlWorkPackType.Enabled = false;
|
||||
}
|
||||
var ddlsysModel = sysPipingData.FirstOrDefault(x => x.Id == subModel.PropertyTechnologyId);
|
||||
if (ddlsysModel != null)
|
||||
{
|
||||
ddbSysPiping.Value = ddlsysModel.Id;
|
||||
ddbSysPiping.Text = ddlsysModel.Code;
|
||||
}
|
||||
ddlfbs.SelectedValue = subModel.Subcontractor;
|
||||
ddlcbs.SelectedValue = subModel.Contractor;
|
||||
ddljl.SelectedValue = subModel.Supervision;
|
||||
@@ -303,7 +253,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
ddljl.SelectedValue = string.Empty;
|
||||
ddlyz.SelectedValue = string.Empty;
|
||||
}
|
||||
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.WorkPackType == workPackType && x.PropertyTechnologyId == propertytechnologyid).OrderBy(x => x.Sort).ToList();
|
||||
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).OrderBy(x => x.Sort).ToList();
|
||||
if (list.Count > 0)
|
||||
{
|
||||
foreach (var item in list)
|
||||
@@ -360,7 +310,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
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;
|
||||
|
||||
@@ -457,88 +406,97 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
|
||||
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 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)
|
||||
//foreach (var item in ddbSysPiping.Values)
|
||||
//{
|
||||
var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
|
||||
JArray mergedData = Grid1.GetMergedData();
|
||||
foreach (JObject mergedRow in mergedData)
|
||||
{
|
||||
var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubSystemId == subSystemId && x.WorkPackId == workPackId && x.WorkPackType == workPackType && x.PropertyTechnologyId == item);
|
||||
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 list = new List<PreRun_SubInspectTermItem>();
|
||||
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
|
||||
if (subSysModel != null)
|
||||
{
|
||||
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 list = new List<PreRun_SubInspectTermItem>();
|
||||
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
|
||||
if (subSysModel != null)
|
||||
//获取子系统工作包检查表，如果不存在则添加
|
||||
if (subTrem == null)
|
||||
{
|
||||
//获取子系统工作包检查表，如果不存在则添加
|
||||
if (subTrem == null)
|
||||
{
|
||||
subTrem = new PreRun_SubInspectTerm();
|
||||
subTrem.SubInspectId = Guid.NewGuid().ToString();
|
||||
subTrem.WorkPackId = workPackId;
|
||||
subTrem.ProjectId = this.CurrUser.LoginProjectId;
|
||||
subTrem.InstallationId = subSysModel.InstallationId;
|
||||
subTrem.ProcessesId = subSysModel.ProcessesId;
|
||||
subTrem.SystemId = subSysModel.SystemId;
|
||||
subTrem.SubSystemId = subSysModel.PreRunId;
|
||||
subTrem.Subcontractor = ddlfbs.SelectedValue;
|
||||
subTrem.Contractor = ddlcbs.SelectedValue;
|
||||
subTrem.Supervision = ddljl.SelectedValue;
|
||||
subTrem.Owner = ddlyz.SelectedValue;
|
||||
subTrem.PropertyTechnologyId = item;
|
||||
subTrem.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue);
|
||||
subTrem.AddUser = this.CurrUser.UserId;
|
||||
subTrem.AddTime = DateTime.Now;
|
||||
subTrems.Add(subTrem);
|
||||
//Funs.DB.PreRun_SubInspectTerm.InsertOnSubmit(subTrem);
|
||||
}
|
||||
|
||||
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId && x.PropertyTechnologyId == item);
|
||||
if (model == null)
|
||||
{
|
||||
model = new PreRun_SubInspectTermItem();
|
||||
model.TermItemId = Guid.NewGuid().ToString();
|
||||
model.SubItemId = subItemId;
|
||||
model.SubInspectId = subTrem.SubInspectId;
|
||||
model.WorkPackId = workPackId;
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.WorkInspectId = workInspectId;
|
||||
model.WorkInspectName = values.Value<string>("WorkInspectName");
|
||||
model.InstallationId = subSysModel.InstallationId;
|
||||
model.ProcessesId = subSysModel.ProcessesId;
|
||||
model.SystemId = subSysModel.SystemId;
|
||||
model.SubSystemId = subSysModel.PreRunId;
|
||||
model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value<string>("InspectedUser")) ? values.Value<string>("InspectedUser") : string.Empty;
|
||||
model.Subcontractor = ddlfbs.SelectedValue;
|
||||
model.Contractor = ddlcbs.SelectedValue;
|
||||
model.Supervision = ddljl.SelectedValue;
|
||||
model.Owner = ddlyz.SelectedValue;
|
||||
model.PropertyTechnologyId = item;
|
||||
model.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue);
|
||||
model.AddUser = this.CurrUser.UserId;
|
||||
model.AddTime = DateTime.Now;
|
||||
model.Sort = i + 1;
|
||||
subTremItems.Add(model);
|
||||
//Funs.DB.PreRun_SubInspectTermItem.InsertOnSubmit(model);
|
||||
}
|
||||
else
|
||||
{
|
||||
model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value<string>("InspectedUser")) ? values.Value<string>("InspectedUser") : string.Empty;
|
||||
model.WorkInspectName = values.Value<string>("WorkInspectName");
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
subTrem = new PreRun_SubInspectTerm();
|
||||
subTrem.SubInspectId = Guid.NewGuid().ToString();
|
||||
subTrem.WorkPackId = workPackId;
|
||||
subTrem.ProjectId = this.CurrUser.LoginProjectId;
|
||||
subTrem.InstallationId = subSysModel.InstallationId;
|
||||
subTrem.ProcessesId = subSysModel.ProcessesId;
|
||||
subTrem.SystemId = subSysModel.SystemId;
|
||||
subTrem.SubSystemId = subSysModel.PreRunId;
|
||||
subTrem.Subcontractor = ddlfbs.SelectedValue;
|
||||
subTrem.Contractor = ddlcbs.SelectedValue;
|
||||
subTrem.Supervision = ddljl.SelectedValue;
|
||||
subTrem.Owner = ddlyz.SelectedValue;
|
||||
subTrem.PropertyTechnologyId = string.Join(",", ddbSysPiping.Values);
|
||||
subTrem.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue);
|
||||
subTrem.AddUser = this.CurrUser.UserId;
|
||||
subTrem.AddTime = DateTime.Now;
|
||||
subTrems.Add(subTrem);
|
||||
}
|
||||
else
|
||||
{
|
||||
subTrem.Subcontractor = ddlfbs.SelectedValue;
|
||||
subTrem.Contractor = ddlcbs.SelectedValue;
|
||||
subTrem.Supervision = ddljl.SelectedValue;
|
||||
subTrem.Owner = ddlyz.SelectedValue;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubInspectId == subInspectId);
|
||||
if (model == null)
|
||||
{
|
||||
model = new PreRun_SubInspectTermItem();
|
||||
model.TermItemId = Guid.NewGuid().ToString();
|
||||
model.SubItemId = subItemId;
|
||||
model.SubInspectId = subTrem.SubInspectId;
|
||||
model.WorkPackId = workPackId;
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.WorkInspectId = workInspectId;
|
||||
model.WorkInspectName = values.Value<string>("WorkInspectName");
|
||||
model.InstallationId = subSysModel.InstallationId;
|
||||
model.ProcessesId = subSysModel.ProcessesId;
|
||||
model.SystemId = subSysModel.SystemId;
|
||||
model.SubSystemId = subSysModel.PreRunId;
|
||||
model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value<string>("InspectedUser")) ? values.Value<string>("InspectedUser") : string.Empty;
|
||||
model.Subcontractor = ddlfbs.SelectedValue;
|
||||
model.Contractor = ddlcbs.SelectedValue;
|
||||
model.Supervision = ddljl.SelectedValue;
|
||||
model.Owner = ddlyz.SelectedValue;
|
||||
model.PropertyTechnologyId = string.Join(",", ddbSysPiping.Values);
|
||||
model.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue);
|
||||
model.AddUser = this.CurrUser.UserId;
|
||||
model.AddTime = DateTime.Now;
|
||||
model.Sort = i + 1;
|
||||
subTremItems.Add(model);
|
||||
}
|
||||
else
|
||||
{
|
||||
model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value<string>("InspectedUser")) ? values.Value<string>("InspectedUser") : string.Empty;
|
||||
model.WorkInspectName = values.Value<string>("WorkInspectName");
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
//Funs.DB.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -666,24 +624,137 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
/// </summary>
|
||||
protected void ddlWorkPackType_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
var selectStr = string.Empty;
|
||||
var propertyTechnologyIds = string.Empty;
|
||||
var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0];
|
||||
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
|
||||
if (ddlWorkPackType.SelectedValue == "1")
|
||||
var subInspectId = string.Empty;
|
||||
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
|
||||
{
|
||||
var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping
|
||||
join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId
|
||||
where selectproper.SubSystemId == subSystemId
|
||||
select new
|
||||
{
|
||||
Id = proper.PropertyId,
|
||||
Code = $"管道：({proper.PipingCode})"
|
||||
};
|
||||
if (sysPipingData.Count() > 0)
|
||||
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
|
||||
}
|
||||
var inspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).ToList();
|
||||
if (!string.IsNullOrWhiteSpace(subInspectId))
|
||||
{
|
||||
var selectItem = inspectItems.FirstOrDefault(x => x.SubInspectId == subInspectId);
|
||||
if (selectItem != null)
|
||||
{
|
||||
selectStr = selectItem.PropertyTechnologyId;
|
||||
}
|
||||
inspectItems.RemoveAll(x => x.SubInspectId == subInspectId);
|
||||
}
|
||||
if (inspectItems.Count > 0) propertyTechnologyIds = string.Join(",", inspectItems.ConvertAll(x => x.PropertyTechnologyId));
|
||||
PipingBrid(ddlWorkPackType.SelectedValue, subSystemId, propertyTechnologyIds, selectStr);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设备选择
|
||||
/// </summary>
|
||||
protected void ddlSysPiping_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
BindGrid(false);
|
||||
}
|
||||
|
||||
/// <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>
|
||||
public void PipingBrid(string WorkPackType, string subSystemId, string propertyTechnologyIds, string selectStr)
|
||||
{
|
||||
var sysPipingData = new List<SelectPropertyTechnology>();
|
||||
if (WorkPackType == "1")
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(propertyTechnologyIds))
|
||||
{
|
||||
var sysData = from proper in Funs.DB.PreRun_PropertySysPiping
|
||||
join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId
|
||||
where selectproper.SubSystemId == subSystemId
|
||||
select new SelectPropertyTechnology()
|
||||
{
|
||||
Id = proper.PropertyId,
|
||||
Code = $"管道：({proper.PipingCode})"
|
||||
};
|
||||
sysPipingData = sysData.ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
var ids = propertyTechnologyIds.Split(',');
|
||||
var sysData = from proper in Funs.DB.PreRun_PropertySysPiping
|
||||
join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId
|
||||
where selectproper.SubSystemId == subSystemId && !ids.Contains(proper.PropertyId)
|
||||
select new SelectPropertyTechnology()
|
||||
{
|
||||
Id = proper.PropertyId,
|
||||
Code = $"管道：({proper.PipingCode})"
|
||||
};
|
||||
sysPipingData = sysData.ToList();
|
||||
}
|
||||
|
||||
if (sysPipingData.Count > 0)
|
||||
{
|
||||
cbSysPiping.DataTextField = "Code";
|
||||
cbSysPiping.DataValueField = "Id";
|
||||
cbSysPiping.DataSource = sysPipingData;
|
||||
cbSysPiping.DataBind();
|
||||
List<string> values = new List<string>();
|
||||
List<string> texts = new List<string>();
|
||||
if (!string.IsNullOrWhiteSpace(selectStr))
|
||||
{
|
||||
var selectIds = selectStr.Split(',').ToList();
|
||||
var selectData = sysPipingData.Where(x => selectIds.Contains(x.Id)).ToList();
|
||||
if (selectData.Count() > 0)
|
||||
{
|
||||
values = selectData.ConvertAll(x => x.Id);
|
||||
texts = selectData.ConvertAll(x => x.Code);
|
||||
}
|
||||
}
|
||||
ddbSysPiping.Values = values.ToArray();
|
||||
ddbSysPiping.Texts = texts.ToArray();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -693,20 +764,51 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
}
|
||||
else
|
||||
{
|
||||
var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping
|
||||
join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId
|
||||
where selecttechnology.SubSystemId == subSystemId
|
||||
select new
|
||||
{
|
||||
Id = technology.TechnologyId,
|
||||
Code = $"设备：({technology.TagNumber})"
|
||||
};
|
||||
if (string.IsNullOrWhiteSpace(propertyTechnologyIds))
|
||||
{
|
||||
var sysData = from technology in Funs.DB.PreRun_TechnologySysPiping
|
||||
join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId
|
||||
where selecttechnology.SubSystemId == subSystemId
|
||||
select new SelectPropertyTechnology()
|
||||
{
|
||||
Id = technology.TechnologyId,
|
||||
Code = $"设备：({technology.TagNumber})"
|
||||
};
|
||||
sysPipingData = sysData.ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
var ids = propertyTechnologyIds.Split(',');
|
||||
var sysData = from technology in Funs.DB.PreRun_TechnologySysPiping
|
||||
join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId
|
||||
where selecttechnology.SubSystemId == subSystemId && !ids.Contains(technology.TechnologyId)
|
||||
select new SelectPropertyTechnology()
|
||||
{
|
||||
Id = technology.TechnologyId,
|
||||
Code = $"设备：({technology.TagNumber})"
|
||||
};
|
||||
sysPipingData = sysData.ToList();
|
||||
}
|
||||
if (sysPipingData.Count() > 0)
|
||||
{
|
||||
cbSysPiping.DataTextField = "Code";
|
||||
cbSysPiping.DataValueField = "Id";
|
||||
cbSysPiping.DataSource = sysPipingData;
|
||||
cbSysPiping.DataBind();
|
||||
List<string> values = new List<string>();
|
||||
List<string> texts = new List<string>();
|
||||
if (!string.IsNullOrWhiteSpace(selectStr))
|
||||
{
|
||||
var selectIds = selectStr.Split(',').ToList();
|
||||
var selectData = sysPipingData.Where(x => selectIds.Contains(x.Id)).ToList();
|
||||
if (selectData.Count() > 0)
|
||||
{
|
||||
values = selectData.ConvertAll(x => x.Id);
|
||||
texts = selectData.ConvertAll(x => x.Code);
|
||||
}
|
||||
}
|
||||
ddbSysPiping.Values = values.ToArray();
|
||||
ddbSysPiping.Texts = texts.ToArray();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -714,15 +816,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
|
||||
cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", ""));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设备选择
|
||||
/// </summary>
|
||||
protected void ddlSysPiping_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
BindGrid(false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user