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

提交试车修改

This commit is contained in:
高飞 2023-08-04 11:19:37 +08:00
parent bc7fb516ec
commit f129533d18
18 changed files with 197 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DataBase/版本日志/SGGLDB_WH_2023-08-03_预试车脚本.sql Normal file
View File

@ -0,0 +1,13 @@
ALTER TABLE PreRun_TechnologySysPiping ALTER Column NameSpecifications varchar(max) null
ALTER TABLE PreRun_TechnologySysPiping ALTER Column Materials varchar(max) null
GO
--删除工作包设置中的编码
ALTER TABLE PreRun_WorkPackage DROP COLUMN WorkPackCode
GO
--清除子系统工作包管理表
truncate table PreRun_SubSysWorkPackage
GO
--子系统工作包管理添加系统主键
alter table PreRun_SubSysWorkPackage add SystemId varchar(50) null
GO

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx
View File

@ -9,11 +9,11 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="true" Title="系统划分"
runat="server" EnableCollapse="true" DataKeyNames="PreRunId,ParentId,PreRunLevel" EnableTree="true"
TreeColumn="PreRunName" DataIDField="PreRunId" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
TreeColumn="PreRunName" DataIDField="PreRunId" AllowPaging="true" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand"
EnableMultiSelect="false" EnableCheckBoxSelect="true" ExpandAllTreeNodes="true">
<Toolbars>

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.cs
View File

@ -43,9 +43,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataSource = tb;
Grid1.DataBind();
}

2
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.cs
View File

@ -42,7 +42,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
TreeNode rootUnitNode = new TreeNode();//定义根节点
rootUnitNode.NodeID = item.WorkPackId;
rootUnitNode.Text = item.WorkPackCode;
rootUnitNode.Text = item.WorkPackName;
rootUnitNode.ToolTip = item.WorkPackName;
rootUnitNode.CommandName = "";
rootUnitNode.EnableClickEvent = true;

2
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx
View File

@ -37,7 +37,7 @@
<f:FormRow runat="server">
<Items>
<f:Label ID="lblgzbmc" Label="工作包名称" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
<f:Label ID="lblgzbbm" Label="工作包编码" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
<%-- <f:Label ID="lblgzbbm" Label="工作包编码" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>--%>
</Items>
</f:FormRow>
<f:FormRow ColumnWidth="100">

6
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.cs
View File

@ -49,12 +49,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var modelQuery = from temp in Funs.DB.PreRun_WorkInspectTemplate
join workpack in Funs.DB.PreRun_WorkPackage on temp.WorkPackId equals workpack.WorkPackId
where temp.WorkInspectId == this.WorkInspectId
select new { temp.WorkInspectId, temp.WorkInspectName, temp.Sort, temp.Remark, temp.WorkPackId, workpack.WorkPackName, workpack.WorkPackCode };
select new { temp.WorkInspectId, temp.WorkInspectName, temp.Sort, temp.Remark, temp.WorkPackId, workpack.WorkPackName };
if (modelQuery.Count() > 0)
{
var model = modelQuery.FirstOrDefault();
lblgzbmc.Text = model.WorkPackName;
lblgzbbm.Text = model.WorkPackCode;
//lblgzbbm.Text = model.WorkPackCode;
txtWorkInspectName.Text = model.WorkInspectName;
txtRemark.Text = model.Remark;
txtSort.Text = model.Sort != null ? model.Sort.ToString() : (Funs.DB.PreRun_WorkInspectTemplate.Count(x => x.WorkPackId == this.WorkPackId) + 1).ToString();
@ -66,7 +66,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (model != null)
{
lblgzbmc.Text = model.WorkPackName;
lblgzbbm.Text = model.WorkPackCode;
//lblgzbbm.Text = model.WorkPackCode;
txtSort.Text = (Funs.DB.PreRun_WorkInspectTemplate.Count(x => x.WorkPackId == this.WorkPackId) + 1).ToString();
}
}

9
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.designer.cs generated
View File

@ -113,15 +113,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Label lblgzbmc;
/// <summary>
/// lblgzbbm 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblgzbbm;
/// <summary>
/// txtWorkInspectName 控件。
/// </summary>

10
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx
View File

@ -27,9 +27,6 @@
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="100px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="260px" ColumnID="WorkPackCode" DataField="WorkPackCode" FieldType="String"
HeaderText="编码" HeaderTextAlign="Center" TextAlign="Left" SortField="WorkPackCode">
</f:RenderField>
<f:RenderField Width="260px" ColumnID="WorkPackName" DataField="WorkPackName" FieldType="String"
HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left" SortField="WorkPackName">
</f:RenderField>
@ -59,9 +56,6 @@
<Items>
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="txtWorkPackCode" Label="编码" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" FocusOnPageLoad="true">
</f:TextBox>
<f:TextBox ID="txtWorkPackName" Label="名称" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" FocusOnPageLoad="true">
</f:TextBox>
@ -117,8 +111,7 @@
var formClientID = '<%= SimpleForm1.ClientID %>';
var hfFormIDClientID = '<%= hfFormID.ClientID %>';
var txtWorkPackNameClientID = '<%= txtWorkPackName.ClientID %>';
var txtWorkPackCodeClientID = '<%= txtWorkPackCode.ClientID %>';
var txtWorkPackNameClientID = '<%= txtWorkPackName.ClientID %>';
var txtRemarkClientID = '<%= txtRemark.ClientID %>';
@ -134,7 +127,6 @@
// 使用当前行数据填充表单字段
F(hfFormIDClientID).setValue(rowId);
F(txtWorkPackNameClientID).setValue(rowValue['WorkPackName']);
F(txtWorkPackCodeClientID).setValue(rowValue['WorkPackCode']);
F(txtRemarkClientID).setValue(rowValue['Remark']);
// 更新提交按钮文本

10
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.cs
View File

@ -30,7 +30,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select WorkPackId,WorkPackName,WorkPackCode,Remark,AddTime,Sort from PreRun_WorkPackage WHERE 1=1 ";
string strSql = @"select WorkPackId,WorkPackName,Remark,AddTime,Sort from PreRun_WorkPackage WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtsWorkPackName.Text.Trim()))
{
@ -216,19 +216,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Alert.ShowInTop("此工作包名称已存在！", MessageBoxIcon.Warning);
return;
}
var deteionCode = Funs.DB.PreRun_WorkPackage.Count(p => p.WorkPackCode == txtWorkPackCode.Text.Trim() && p.WorkPackId != strRowID);
if (deteionCode > 0)
{
Alert.ShowInTop("此工作包编码已存在！", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrEmpty(strRowID))
{
PreRun_WorkPackage model = new PreRun_WorkPackage();
model.WorkPackId = Guid.NewGuid().ToString();
model.WorkPackName = this.txtWorkPackName.Text.Trim();
model.WorkPackCode = this.txtWorkPackCode.Text.Trim();
model.Remark = this.txtRemark.Text.Trim();
Funs.DB.PreRun_WorkPackage.InsertOnSubmit(model);
Funs.DB.SubmitChanges();
@ -239,7 +232,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (model != null)
{
model.WorkPackName = this.txtWorkPackName.Text.Trim();
model.WorkPackCode = this.txtWorkPackCode.Text.Trim();
model.Remark = this.txtRemark.Text.Trim();
Funs.DB.SubmitChanges();
}

9
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.designer.cs generated
View File

@ -113,15 +113,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.HiddenField hfFormID;
/// <summary>
/// txtWorkPackCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackCode;
/// <summary>
/// txtWorkPackName 控件。
/// </summary>

2
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx
View File

@ -23,7 +23,7 @@
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="工作包" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="true">
AutoLeafIdentification="true" EnableSingleExpand="false">
</f:Tree>
</Items>
</f:Panel>

118
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
View File

@ -41,7 +41,7 @@ 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
select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackCode, c.WorkPackName };
select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName };
if (list.Count() > 0)
{
@ -57,7 +57,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootUnitNode.EnableExpandEvent = true;
rootNode.Nodes.Add(rootUnitNode);
rootUnitNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackCode, x.WorkPackName }).ToList();
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList();
if (worklist.Count > 0)
{
foreach (var itemWork in worklist)
@ -93,21 +93,42 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void BindGrid()
{
var result = new List<Brid_SubInspectTermItem>();
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
var subSystemId = 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).ToList();
if (list.Count == 0)
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList();
if (list.Count > 0)
{
list = new List<PreRun_SubInspectTermItem>();
var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).ToList();
if (defaultDatas.Count > 0)
foreach (var item in list)
{
int index = 0;
foreach (var item in defaultDatas)
var model = new Brid_SubInspectTermItem();
model.SubItemId = item.SubItemId;
model.ProjectId = item.ProjectId;
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.InspectedUser = item.InspectedUser;
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)
{
int index = list.Count + 1;
foreach (var item in defaultDatas)
{
if (list.Count(x => x.WorkInspectName == item.WorkInspectName) == 0)
{
var model = new PreRun_SubInspectTermItem();
var model = new Brid_SubInspectTermItem();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = item.WorkPackId;
@ -118,14 +139,21 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.Sort = index + 1;
list.Add(model);
model.isChick = false;
result.Add(model);
index++;
}
}
}
Grid1.DataSource = list;
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;
@ -141,8 +169,58 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlInspectedUser.DataValueField = "UserId";
ddlInspectedUser.DataSource = data;
ddlInspectedUser.DataBind();
//Funs.FineUIPleaseSelect(ddlInspectedUser);
#region 注释
//var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
//var subSystemId = 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).OrderBy(x => x.Sort).ToList();
//if (list.Count == 0)
//{
// list = new List<PreRun_SubInspectTermItem>();
// var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x=>x.Sort).ToList();
// if (defaultDatas.Count > 0)
// {
// int index = 0;
// foreach (var item in defaultDatas)
// {
// var model = new PreRun_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;
// list.Add(model);
// index++;
// }
// }
//}
//Grid1.DataSource = list;
//Grid1.DataBind();
////检查人绑定
//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 data = userList.ToList();
//if (addUserList.Count() > 0)
//{
// data.AddRange(addUserList);
//}
//DropDownList ddlInspectedUser = Grid1.FindColumn("InspectedUser").FindControl("ddlInspectedUser") as DropDownList;
//ddlInspectedUser.DataTextField = "UserName";
//ddlInspectedUser.DataValueField = "UserId";
//ddlInspectedUser.DataSource = data;
//ddlInspectedUser.DataBind();
#endregion
}
/// <summary>
@ -363,5 +441,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
return result;
}
/// <summary>
/// 绑定实体
/// </summary>
public class Brid_SubInspectTermItem : PreRun_SubInspectTermItem
{
/// <summary>
/// 是否选中
/// </summary>
public bool isChick { get; set; }
}
}
}

7
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx
View File

@ -31,8 +31,8 @@
</Toolbars>--%>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="子系统工作包管理节点树" OnNodeCommand="tvControlItem_NodeCommand"
Height="470px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true" OnNodeExpand="tvControlItem_NodeExpand">
Height="1000px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="false" EnableTextSelection="true" OnNodeExpand="tvControlItem_NodeExpand">
</f:Tree>
</Items>
</f:Panel>
@ -78,9 +78,6 @@
<f:Label ID="lblszxtbm" Label="SS子系统编码" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="gzb" Hidden="true">
<Items>
<f:Grid Height="450px" ID="Grid1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="WorkPackId" DataKeyNames="WorkPackId" AllowSorting="true"

54
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx.cs
View File

@ -21,6 +21,10 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// <summary>
/// 子系统主键
/// </summary>
public string SystemId { get { return (string)ViewState["SystemId"]; } set { ViewState["SystemId"] = value; } }
/// <summary>
/// 子系统主键
/// </summary>
public string SsubSystemId { get { return (string)ViewState["SsubSystemId"]; } set { ViewState["SsubSystemId"] = value; } }
protected void Page_Load(object sender, EventArgs e)
@ -47,7 +51,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var allPreRunLs = Funs.DB.PreRun_SysDevice.Where(p => p.ProjectId == this.CurrUser.LoginProjectId).ToList();
var onePreRunLs = allPreRunLs.Where(p => p.PreRunLevel == 1);
var onePreRunLs = allPreRunLs.Where(p => p.PreRunLevel == 1).OrderBy(x => x.Sort);
foreach (var item in onePreRunLs)
{
TreeNode rootUnitNode = new TreeNode();//定义根节点
@ -70,7 +74,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
private void BindNodes(TreeNode node, List<PreRun_SysDevice> list, string parentId)
{
var itemList = list.Where(p => p.ParentId == parentId).ToList();
var itemList = list.Where(p => p.ParentId == parentId).OrderBy(x => x.Sort).ToList();
if (itemList.Count > 0)
{
foreach (var item in itemList)
@ -152,7 +156,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
lblszxtmc.Text = list.FirstOrDefault(p => p.PreRunLevel == 4).PreRunName;
lblszxtbm.Text = list.FirstOrDefault(p => p.PreRunLevel == 4).PreRunCode;
this.SsubSystemId = list.FirstOrDefault(p => p.PreRunLevel == 4).PreRunId;
var workPackages = Funs.DB.PreRun_SubSysWorkPackage.Where(p => p.SubSystemId == this.SsubSystemId).ToList();
this.SystemId = list.FirstOrDefault(p => p.PreRunLevel == 4).ParentId;
var workPackages = Funs.DB.PreRun_SubSysWorkPackage.Where(p => p.SubSystemId == this.SsubSystemId).OrderBy(x => x.Sort).ToList();
if (workPackages.Count > 0)
{
var workIds = workPackages.ConvertAll(p => p.WorkPackId);
@ -163,6 +168,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
Grid1.DataSource = null;
Grid1.DataBind();
drpWorkPack.Values = null;
}
}
}
@ -193,6 +199,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var workId = Grid1.DataKeys[i][0].ToString();
var model = new PreRun_SubSysWorkPackage();
model.SubSysId = Guid.NewGuid().ToString();
model.SystemId = prerunModel.ParentId;
model.SubSystemId = prerunModel.PreRunId;
model.WorkPackId = workId;
model.WorkPackCode = !string.IsNullOrWhiteSpace(values.Value<string>("WorkPackCode")) ? values.Value<string>("WorkPackCode") : "WP";
@ -224,32 +231,44 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
if (!string.IsNullOrWhiteSpace(this.SsubSystemId))
{
var result = new List<WorkData>();
var data = from a in Funs.DB.PreRun_WorkPackage.Where(p => workPackIds.Contains(p.WorkPackId))
join b in Funs.DB.PreRun_SubSysWorkPackage.Where(p => p.SubSystemId == this.SsubSystemId) on a.WorkPackId equals b.WorkPackId into bb
from t in bb.DefaultIfEmpty()
select new WorkData()
{
WorkPackId = a.WorkPackId,
WorkPackCode = a.WorkPackCode,
WorkPackCode = t.WorkPackCode,
WorkPackName = a.WorkPackName,
SystemId = t.SystemId,
Sort = a.Sort,
Remark = t.Remark
};
//var list = data.ToList();
//if (list.Count > 0)
//{
// int i = 1;
// list.ForEach(a =>
// {
// var num = Funs.DB.SubSys_WorkPackage.Count(p => p.SubSystemId == this.SsubSystemId) + i;
// a.WorkPackCode = string.Format("WP{0}", string.Format("{0:d2}", num));
// i++;
// });
//}
if (data.Count() > 0)
{
var list = data.OrderBy(p => p.Sort).ToList();
Grid1.DataSource = list;
int i = 1;
foreach (var item in data.OrderBy(p => p.Sort))
{
var model = new WorkData();
model.WorkPackId = item.WorkPackId;
model.WorkPackName = item.WorkPackName;
model.SystemId = item.SystemId;
if (string.IsNullOrWhiteSpace(item.WorkPackCode))
{
var num = Funs.DB.PreRun_SubSysWorkPackage.Count(p => p.SystemId == this.SystemId) + i;
model.WorkPackCode = $"WP{string.Format("{0:d3}", num)}";
i++;
}
else
{
model.WorkPackCode = item.WorkPackCode;
}
model.Sort = item.Sort;
model.Remark = item.Remark;
result.Add(model);
}
result = result.OrderBy(p => p.Sort).ToList();
Grid1.DataSource = result;
Grid1.DataBind();
}
else
@ -302,6 +321,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public class WorkData
{
public string SystemId { get; set; }
public string WorkPackId { get; set; }
public string WorkPackName { get; set; }
public int? Sort { get; set; }

2
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx
View File

@ -23,7 +23,7 @@
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="工作包" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="true">
AutoLeafIdentification="true" EnableSingleExpand="false">
</f:Tree>
</Items>
</f:Panel>

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs
View File

@ -47,7 +47,7 @@ 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.WorkPackCode, c.WorkPackName };
select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName };
if (list.Count() > 0)
{
@ -63,7 +63,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
rootUnitNode.EnableExpandEvent = true;
rootNode.Nodes.Add(rootUnitNode);
rootUnitNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackCode, x.WorkPackName }).ToList();
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList();
if (worklist.Count > 0)
{
foreach (var itemWork in worklist)

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx
View File

@ -22,8 +22,8 @@
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="子系统工作包管理节点树" OnNodeCommand="tvControlItem_NodeCommand"
Height="470px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true" OnNodeExpand="tvControlItem_NodeExpand">
Height="1000px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="false" EnableTextSelection="true" OnNodeExpand="tvControlItem_NodeExpand">
</f:Tree>
</Items>
</f:Panel>

50
SGGL/Model/Model.cs
View File

@ -257347,6 +257347,8 @@ namespace Model
private System.Nullable<int> _Sort;
private string _SystemId;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -257367,6 +257369,8 @@ namespace Model
partial void OnAddTimeChanged();
partial void OnSortChanging(System.Nullable<int> value);
partial void OnSortChanged();
partial void OnSystemIdChanging(string value);
partial void OnSystemIdChanged();
#endregion
public PreRun_SubSysWorkPackage()
@ -257534,6 +257538,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")]
public string SystemId
{
get
{
return this._SystemId;
}
set
{
if ((this._SystemId != value))
{
this.OnSystemIdChanging(value);
this.SendPropertyChanging();
this._SystemId = value;
this.SendPropertyChanged("SystemId");
this.OnSystemIdChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -258356,7 +258380,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Materials", DbType="VarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Materials", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string Materials
{
get
@ -258771,8 +258795,6 @@ namespace Model
private string _WorkPackId;
private string _WorkPackCode;
private string _WorkPackName;
private string _Remark;
@ -258789,8 +258811,6 @@ namespace Model
partial void OnCreated();
partial void OnWorkPackIdChanging(string value);
partial void OnWorkPackIdChanged();
partial void OnWorkPackCodeChanging(string value);
partial void OnWorkPackCodeChanged();
partial void OnWorkPackNameChanging(string value);
partial void OnWorkPackNameChanged();
partial void OnRemarkChanging(string value);
@ -258828,26 +258848,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackCode", DbType="VarChar(50)")]
public string WorkPackCode
{
get
{
return this._WorkPackCode;
}
set
{
if ((this._WorkPackCode != value))
{
this.OnWorkPackCodeChanging(value);
this.SendPropertyChanging();
this._WorkPackCode = value;
this.SendPropertyChanged("WorkPackCode");
this.OnWorkPackCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackName", DbType="VarChar(50)")]
public string WorkPackName
{