diff --git a/DataBase/版本日志/SGGLDB_WH_2023-08-03_预试车脚本.sql b/DataBase/版本日志/SGGLDB_WH_2023-08-03_预试车脚本.sql new file mode 100644 index 00000000..7429adb1 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-08-03_预试车脚本.sql @@ -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 \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx index bad3b6db..efee74fa 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx @@ -9,11 +9,11 @@
- + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.cs index 884d0a96..0db6e006 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.cs @@ -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(); } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.cs index 53492268..3b5fe6b2 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.cs @@ -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; diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx index a2b65114..b07e6e93 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx @@ -37,7 +37,7 @@ - + <%-- --%> diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.cs index 35286404..729509aa 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.cs @@ -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(); } } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.designer.cs index 723161fb..51f8cbf0 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx.designer.cs @@ -113,15 +113,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Label lblgzbmc; - /// - /// lblgzbbm 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label lblgzbbm; - /// /// txtWorkInspectName 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx index 52face44..5be4e552 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx @@ -27,9 +27,6 @@ - - @@ -59,9 +56,6 @@ - - @@ -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']); // 更新提交按钮文本 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.cs index 713f2460..74330758 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 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 listStr = new List(); 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(); } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.designer.cs index 7ecabb64..7ce6395c 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.designer.cs @@ -113,15 +113,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.HiddenField hfFormID; - /// - /// txtWorkPackCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkPackCode; - /// /// txtWorkPackName 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx index 1e80653d..a6a50fad 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx @@ -23,7 +23,7 @@ + AutoLeafIdentification="true" EnableSingleExpand="false"> diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs index ba0b4331..15a190f0 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs @@ -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 /// public void BindGrid() { + var result = new List(); 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(); - 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(); + // 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() { 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 } /// @@ -363,5 +441,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun return result; } + + /// + /// 绑定实体 + /// + public class Brid_SubInspectTermItem : PreRun_SubInspectTermItem + { + /// + /// 是否选中 + /// + public bool isChick { get; set; } + } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx index e998d896..9b17f5dd 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx @@ -31,8 +31,8 @@ --%> + Height="1000px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" + AutoLeafIdentification="true" EnableSingleExpand="false" EnableTextSelection="true" OnNodeExpand="tvControlItem_NodeExpand"> @@ -78,9 +78,6 @@ - - - + public string SystemId { get { return (string)ViewState["SystemId"]; } set { ViewState["SystemId"] = value; } } + /// + /// 子系统主键 + /// 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 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("WorkPackCode")) ? values.Value("WorkPackCode") : "WP"; @@ -224,32 +231,44 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { if (!string.IsNullOrWhiteSpace(this.SsubSystemId)) { + var result = new List(); 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; } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx index 8bb7de0b..78d19a08 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx @@ -23,7 +23,7 @@ + AutoLeafIdentification="true" EnableSingleExpand="false"> diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs index 1f04d509..34e7fc5f 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs @@ -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) diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx index 05dc320f..8a061f51 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx @@ -22,8 +22,8 @@ ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> + Height="1000px" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" + AutoLeafIdentification="true" EnableSingleExpand="false" EnableTextSelection="true" OnNodeExpand="tvControlItem_NodeExpand"> diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 32711818..840c11be 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -257347,6 +257347,8 @@ namespace Model private System.Nullable _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 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 {