diff --git a/DataBase/版本日志/SGGLDB_WH_2023-04-24.sql b/DataBase/版本日志/SGGLDB_WH_2023-04-24.sql new file mode 100644 index 00000000..334aa49e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-04-24.sql @@ -0,0 +1,28 @@ +insert into [Base_CNProfessional] values +('13d9ee9a-e585-4b40-907a-91fefcfce370','DZ','װ',12) +GO +insert into [Base_CNProfessional] values +('5111e93d-1e8c-4ffa-ade1-8ad7934c2871','JH','ƻ',1) +GO +update [Base_CNProfessional] set SortIndex=6 where CNProfessionalId='BEFD0713-9BA2-4973-B0A8-7C54D41CCEC0' +GO +update [Base_CNProfessional] set SortIndex=9 where CNProfessionalId='CVDSFDSF-RFRE-CDDE-BFRE-DFVDFEFEW567' +GO +update [Base_CNProfessional] set SortIndex=5 where CNProfessionalId='DEB367FF-AD35-41A0-B68E-FA8E68737B93' +GO +insert into [Base_CNProfessional] values +('ee762383-15df-4612-8f44-e4bfb26b351d','HJ','',10) +GO +update [Base_CNProfessional] set SortIndex=3,[ProfessionalName]='' where CNProfessionalId='F41C5022-F499-4BD7-84B6-E87E4CE53CAC' +GO +delete from Base_CNProfessional where CNProfessionalId='13d9ee9a-e585-4b40-907a-91fefcfce370' +GO +delete from WBS_Breakdown +delete from WBS_Division +GO +alter table WBS_Division add SubItemType char(1) null +alter table WBS_Breakdown add CheckAcceptType char(1) null +GO +insert into WBS_Division select * from CNCEC_SUBQHSEDB..WBS_Division +insert into WBS_Breakdown select * from CNCEC_SUBQHSEDB..WBS_Breakdown +GO diff --git a/DataBase/版本日志/SGGLDB_WH_2023-04-24版本日志.txt b/DataBase/版本日志/SGGLDB_WH_2023-04-24版本日志.txt new file mode 100644 index 00000000..e1074e42 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-04-24版本日志.txt @@ -0,0 +1,3 @@ +--ADD BY GaoFei 2023-04-23 +1、修改质量WBS库为集团QHSE平台版本内容 +--END \ No newline at end of file diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs index 29253454..881910b2 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs @@ -260,6 +260,7 @@ namespace BLL newBreakdownProject.YeZhu = breakdownProject.YeZhu; newBreakdownProject.FenBao = breakdownProject.FenBao; newBreakdownProject.SourceBreakdownId = breakdownProject.SourceBreakdownId; + newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType; db.WBS_BreakdownProject.InsertOnSubmit(newBreakdownProject); db.SubmitChanges(); @@ -288,6 +289,7 @@ namespace BLL newBreakdownProject.JianLi = breakdownProject.JianLi; newBreakdownProject.YeZhu = breakdownProject.YeZhu; newBreakdownProject.FenBao = breakdownProject.FenBao; + newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/BreakdownService.cs b/SGGL/BLL/CQMS/WBS/BreakdownService.cs index ec105292..f858d9cc 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownService.cs @@ -65,6 +65,7 @@ namespace BLL x.WuHuan, x.JianLi, x.YeZhu, + x.CheckAcceptType, CheckPointsDef = Funs.GetSubStr(x.CheckPoints, 15), RecordAndCodeDef = Funs.GetSubStr(x.RecordAndCode, 15), x.ModelURL @@ -107,6 +108,7 @@ namespace BLL newBreakdown.WuHuan = breakdown.WuHuan; newBreakdown.JianLi = breakdown.JianLi; newBreakdown.YeZhu = breakdown.YeZhu; + newBreakdown.CheckAcceptType = breakdown.CheckAcceptType; db.WBS_Breakdown.InsertOnSubmit(newBreakdown); db.SubmitChanges(); @@ -134,6 +136,7 @@ namespace BLL newBreakdown.WuHuan = breakdown.WuHuan; newBreakdown.JianLi = breakdown.JianLi; newBreakdown.YeZhu = breakdown.YeZhu; + newBreakdown.CheckAcceptType = breakdown.CheckAcceptType; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs index 77c0c34d..bcbb8004 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs @@ -78,6 +78,7 @@ namespace BLL newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId; newDivisionProject.UnitWorkId = divisionProject.UnitWorkId; newDivisionProject.OldDivisionId = divisionProject.OldDivisionId; + newDivisionProject.SubItemType = divisionProject.SubItemType; db.WBS_DivisionProject.InsertOnSubmit(newDivisionProject); db.SubmitChanges(); } @@ -96,6 +97,7 @@ namespace BLL newDivisionProject.SuperDivisionId = divisionProject.SuperDivisionId; newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId; newDivisionProject.IsSelected = divisionProject.IsSelected; + newDivisionProject.SubItemType = divisionProject.SubItemType; db.SubmitChanges(); } diff --git a/SGGL/BLL/CQMS/WBS/DivisionService.cs b/SGGL/BLL/CQMS/WBS/DivisionService.cs index 81e4adee..1918d60e 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionService.cs @@ -75,6 +75,7 @@ namespace BLL newDivision.SortIndex = division.SortIndex; newDivision.SuperDivisionId = division.SuperDivisionId; newDivision.CNProfessionalId = division.CNProfessionalId; + newDivision.SubItemType = division.SubItemType; db.WBS_Division.InsertOnSubmit(newDivision); db.SubmitChanges(); } @@ -92,6 +93,7 @@ namespace BLL newDivision.SortIndex = division.SortIndex; newDivision.SuperDivisionId = division.SuperDivisionId; newDivision.CNProfessionalId = division.CNProfessionalId; + newDivision.SubItemType = division.SubItemType; db.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlPoint.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlPoint.aspx.cs index 9baf3d38..78b7943b 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlPoint.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlPoint.aspx.cs @@ -55,8 +55,8 @@ namespace FineUIPro.Web.CQMS.WBS this.trWBS.EnableSingleClickExpand = true; TreeNode newNode1 = new TreeNode(); newNode1.Text = "建筑工程"; - newNode1.NodeID = Const.CNProfessionalConstructId; - newNode1.CommandName = "CNProfessional"; + newNode1.NodeID = "1"; + newNode1.CommandName = "ProjectType"; newNode1.EnableExpandEvent = true; newNode1.EnableClickEvent = true; trWBS.Nodes.Add(newNode1); @@ -93,22 +93,45 @@ namespace FineUIPro.Web.CQMS.WBS e.Node.Nodes.Clear(); if (e.Node.CommandName == "ProjectType") //展开工程类型 { - var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList(); - foreach (var c in cNProfessional) + if (e.NodeID == "1") { - TreeNode newCNProfessionalNode = new TreeNode(); - newCNProfessionalNode.Text = c.ProfessionalName; - newCNProfessionalNode.NodeID = c.CNProfessionalId; - newCNProfessionalNode.CommandName = "CNProfessional"; - newCNProfessionalNode.EnableExpandEvent = true; - newCNProfessionalNode.EnableClickEvent = true; - e.Node.Nodes.Add(newCNProfessionalNode); - TreeNode tempNode = new TreeNode(); - tempNode.NodeID = ""; - tempNode.Text = ""; - tempNode.EnableExpandEvent = true; - tempNode.EnableClickEvent = true; - newCNProfessionalNode.Nodes.Add(tempNode); + var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId == Const.CNProfessionalCVId orderby x.SortIndex select x).ToList(); + foreach (var c in cNProfessional) + { + TreeNode newCNProfessionalNode = new TreeNode(); + newCNProfessionalNode.Text = c.ProfessionalName; + newCNProfessionalNode.NodeID = c.CNProfessionalId; + newCNProfessionalNode.CommandName = "CNProfessional"; + newCNProfessionalNode.EnableExpandEvent = true; + newCNProfessionalNode.EnableClickEvent = true; + e.Node.Nodes.Add(newCNProfessionalNode); + TreeNode tempNode = new TreeNode(); + tempNode.NodeID = ""; + tempNode.Text = ""; + tempNode.EnableExpandEvent = true; + tempNode.EnableClickEvent = true; + newCNProfessionalNode.Nodes.Add(tempNode); + } + } + else + { + var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList(); + foreach (var c in cNProfessional) + { + TreeNode newCNProfessionalNode = new TreeNode(); + newCNProfessionalNode.Text = c.ProfessionalName; + newCNProfessionalNode.NodeID = c.CNProfessionalId; + newCNProfessionalNode.CommandName = "CNProfessional"; + newCNProfessionalNode.EnableExpandEvent = true; + newCNProfessionalNode.EnableClickEvent = true; + e.Node.Nodes.Add(newCNProfessionalNode); + TreeNode tempNode = new TreeNode(); + tempNode.NodeID = ""; + tempNode.Text = ""; + tempNode.EnableExpandEvent = true; + tempNode.EnableClickEvent = true; + newCNProfessionalNode.Nodes.Add(tempNode); + } } } else if (e.Node.CommandName == "CNProfessional") //展开专业 diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx index 9331d45f..7f6ef423 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx @@ -42,6 +42,17 @@ + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs index bc86b744..84af102e 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs @@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS { string divisionId = Request.Params["divisionId"]; BreakdownId = Request.Params["breakdownId"]; + Funs.FineUIPleaseSelect(this.drpCheckAcceptType); Model.WBS_Breakdown breakdown = BLL.BreakdownService.GetBreakdownById(BreakdownId); var division = BLL.DivisionService.GetDivisionById(divisionId); if (division != null) @@ -77,6 +78,10 @@ namespace FineUIPro.Web.CQMS.WBS { this.txtSortIndex.Text = breakdown.SortIndex.ToString(); } + if (!string.IsNullOrEmpty(breakdown.CheckAcceptType)) + { + this.drpCheckAcceptType.SelectedValue = breakdown.CheckAcceptType; + } this.txtRemark.Text = breakdown.Remark; } } @@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS newBreakdown.WuHuan = this.WuHuan.Text.Trim(); newBreakdown.JianLi = this.JianLi.Text.Trim(); newBreakdown.YeZhu = this.YeZhu.Text.Trim(); + if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null) + { + newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue; + } if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) { try diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs index eee1abda..c711f7bc 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.TextBox txtClass; + /// + /// drpCheckAcceptType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckAcceptType; + /// /// tr1 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx index f74247b7..dce0097e 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx @@ -42,6 +42,17 @@ + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs index 4751d56e..bb089b55 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs @@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS { string divisionProjectId = Request.Params["divisionProjectId"]; BreakdownProjectId = Request.Params["breakdownProjectId"]; + Funs.FineUIPleaseSelect(this.drpCheckAcceptType); Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(BreakdownProjectId); var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId); if (division != null) @@ -73,6 +74,10 @@ namespace FineUIPro.Web.CQMS.WBS this.JianLi.Text = breakdownProject.JianLi; this.WuHuan.Text = breakdownProject.WuHuan; this.FenBao.Text = breakdownProject.FenBao; + if (!string.IsNullOrEmpty(breakdownProject.CheckAcceptType)) + { + this.drpCheckAcceptType.SelectedValue = breakdownProject.CheckAcceptType; + } if (breakdownProject.SortIndex != null) { this.txtSortIndex.Text = breakdownProject.SortIndex.ToString(); @@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS newBreakdown.WuHuan = this.WuHuan.Text.Trim(); newBreakdown.JianLi = this.JianLi.Text.Trim(); newBreakdown.YeZhu = this.YeZhu.Text.Trim(); + if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null) + { + newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue; + } if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) { try diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs index d7449c3d..939f2385 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.TextBox txtClass; + /// + /// drpCheckAcceptType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckAcceptType; + /// /// tr1 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx index 927e71c4..af19d062 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx @@ -23,6 +23,16 @@ + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs index e6cd77c6..8b4364ea 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs @@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS if (!IsPostBack) { string selectedCode = Request.Params["selectedCode"]; + Funs.FineUIPleaseSelect(this.drpSubItemType); if (Request.Params["type"] == "add") { Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode); @@ -50,6 +51,10 @@ namespace FineUIPro.Web.CQMS.WBS Model.WBS_Division divisionProject = BLL.DivisionService.GetDivisionById(selectedCode); this.txtDivisionCode.Text = divisionProject.DivisionCode; this.txtDivisionName.Text = divisionProject.DivisionName; + if (!string.IsNullOrEmpty(divisionProject.SubItemType)) + { + this.drpSubItemType.SelectedValue = divisionProject.SubItemType; + } if (divisionProject.SortIndex != null) { this.txtSortIndex.Text = divisionProject.SortIndex.ToString(); @@ -65,6 +70,11 @@ namespace FineUIPro.Web.CQMS.WBS /// protected void btnSave_Click(object sender, EventArgs e) { + if (this.drpSubItemType.SelectedValue == BLL.Const._Null) + { + ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning); + return; + } if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim())) { string selectedCode = Request.Params["selectedCode"]; @@ -75,6 +85,7 @@ namespace FineUIPro.Web.CQMS.WBS Model.WBS_Division newDivision = new Model.WBS_Division(); newDivision.DivisionCode = this.txtDivisionCode.Text.Trim(); newDivision.DivisionName = this.txtDivisionName.Text.Trim(); + newDivision.SubItemType = this.drpSubItemType.SelectedValue; if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) { try @@ -109,6 +120,7 @@ namespace FineUIPro.Web.CQMS.WBS { divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim(); divisionProject.DivisionName = this.txtDivisionName.Text.Trim(); + divisionProject.SubItemType = this.drpSubItemType.SelectedValue; if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) { divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs index 29fc5943..358a04da 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.TextBox txtDivisionCode; + /// + /// drpSubItemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSubItemType; + /// /// txtSortIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx index baa8f264..062b25bd 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx @@ -23,6 +23,16 @@ + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs index 2fe04461..aef048a4 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs @@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS if (!IsPostBack) { string selectedCode = Request.Params["selectedCode"]; + Funs.FineUIPleaseSelect(this.drpSubItemType); if (Request.Params["type"] == "add") { Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode); @@ -51,6 +52,10 @@ namespace FineUIPro.Web.CQMS.WBS Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(selectedCode); this.txtDivisionCode.Text = divisionProject.DivisionCode; this.txtDivisionName.Text = divisionProject.DivisionName; + if (!string.IsNullOrEmpty(divisionProject.SubItemType)) + { + this.drpSubItemType.SelectedValue = divisionProject.SubItemType; + } if (divisionProject.SortIndex != null) { this.txtSortIndex.Text = divisionProject.SortIndex.ToString(); @@ -66,6 +71,11 @@ namespace FineUIPro.Web.CQMS.WBS /// protected void btnSave_Click(object sender, EventArgs e) { + if (this.drpSubItemType.SelectedValue == BLL.Const._Null) + { + ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning); + return; + } if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim())) { string selectedCode = Request.Params["selectedCode"]; @@ -77,6 +87,7 @@ namespace FineUIPro.Web.CQMS.WBS newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim(); newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim(); newDivisionProject.UnitWorkId = Request.Params["unitWorkId"]; + newDivisionProject.SubItemType = this.drpSubItemType.SelectedValue; if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) { try @@ -112,6 +123,7 @@ namespace FineUIPro.Web.CQMS.WBS { divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim(); divisionProject.DivisionName = this.txtDivisionName.Text.Trim(); + divisionProject.SubItemType = this.drpSubItemType.SelectedValue; if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) { divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs index fc997d47..f6a7a556 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.TextBox txtDivisionCode; + /// + /// drpSubItemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSubItemType; + /// /// txtSortIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs index fefb56b8..23e76f22 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs @@ -115,8 +115,8 @@ namespace FineUIPro.Web.CQMS.WBS { TreeNode newNode1 = new TreeNode(); newNode1.Text = "建筑工程"; - newNode1.NodeID = e.NodeID + "|" + Const.CNProfessionalConstructId; - newNode1.CommandName = "CNProfessional"; + newNode1.NodeID = e.NodeID + "|" + "1"; + newNode1.CommandName = "ProjectType"; newNode1.EnableExpandEvent = true; newNode1.EnableClickEvent = true; e.Node.Nodes.Add(newNode1); @@ -142,22 +142,45 @@ namespace FineUIPro.Web.CQMS.WBS } else if (e.Node.CommandName == "ProjectType") //展开工程类型 { - var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList(); - foreach (var c in cNProfessional) + if (e.NodeID.Split('|')[1] == "1") { - TreeNode newCNProfessionalNode = new TreeNode(); - newCNProfessionalNode.Text = c.ProfessionalName; - newCNProfessionalNode.NodeID = e.NodeID.Split('|')[0] + "|" + c.CNProfessionalId; - newCNProfessionalNode.CommandName = "CNProfessional"; - newCNProfessionalNode.EnableExpandEvent = true; - newCNProfessionalNode.EnableClickEvent = true; - e.Node.Nodes.Add(newCNProfessionalNode); - TreeNode tempNode = new TreeNode(); - tempNode.NodeID = ""; - tempNode.Text = ""; - tempNode.EnableExpandEvent = true; - tempNode.EnableClickEvent = true; - newCNProfessionalNode.Nodes.Add(tempNode); + var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId == Const.CNProfessionalCVId orderby x.SortIndex select x).ToList(); + foreach (var c in cNProfessional) + { + TreeNode newCNProfessionalNode = new TreeNode(); + newCNProfessionalNode.Text = c.ProfessionalName; + newCNProfessionalNode.NodeID = e.NodeID.Split('|')[0] + "|" + c.CNProfessionalId; + newCNProfessionalNode.CommandName = "CNProfessional"; + newCNProfessionalNode.EnableExpandEvent = true; + newCNProfessionalNode.EnableClickEvent = true; + e.Node.Nodes.Add(newCNProfessionalNode); + TreeNode tempNode = new TreeNode(); + tempNode.NodeID = ""; + tempNode.Text = ""; + tempNode.EnableExpandEvent = true; + tempNode.EnableClickEvent = true; + newCNProfessionalNode.Nodes.Add(tempNode); + } + } + else + { + var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList(); + foreach (var c in cNProfessional) + { + TreeNode newCNProfessionalNode = new TreeNode(); + newCNProfessionalNode.Text = c.ProfessionalName; + newCNProfessionalNode.NodeID = e.NodeID.Split('|')[0] + "|" + c.CNProfessionalId; + newCNProfessionalNode.CommandName = "CNProfessional"; + newCNProfessionalNode.EnableExpandEvent = true; + newCNProfessionalNode.EnableClickEvent = true; + e.Node.Nodes.Add(newCNProfessionalNode); + TreeNode tempNode = new TreeNode(); + tempNode.NodeID = ""; + tempNode.Text = ""; + tempNode.EnableExpandEvent = true; + tempNode.EnableClickEvent = true; + newCNProfessionalNode.Nodes.Add(tempNode); + } } } else if (e.Node.CommandName == "CNProfessional") //展开专业 diff --git a/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs index 5576f4f6..5ae96edc 100644 --- a/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs @@ -125,6 +125,7 @@ namespace FineUIPro.Web.ProjectData newDivisionProject.CNProfessionalId = d1.CNProfessionalId; newDivisionProject.UnitWorkId = UnitWork.UnitWorkId; newDivisionProject.OldDivisionId = d1.DivisionId; + newDivisionProject.SubItemType = d1.SubItemType; BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //分部 List divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d1.DivisionId select x).ToList(); if (divisions2.Count() > 0) @@ -157,6 +158,7 @@ namespace FineUIPro.Web.ProjectData bp.FenBao = b.FenBao; bp.YeZhu = b.YeZhu; bp.SourceBreakdownId = b.BreakdownId; + bp.CheckAcceptType = b.CheckAcceptType; BLL.BreakdownProjectService.AddBreakdownProject(bp); } @@ -324,6 +326,7 @@ namespace FineUIPro.Web.ProjectData newDivisionProject.CNProfessionalId = d.CNProfessionalId; newDivisionProject.UnitWorkId = unitWorkId; newDivisionProject.OldDivisionId = d.DivisionId; + newDivisionProject.SubItemType = d.SubItemType; BLL.DivisionProjectService.AddDivisionProject(newDivisionProject); //子级分部 List divisions2 = (from x in Funs.DB.WBS_Division where x.SuperDivisionId == d.DivisionId select x).ToList(); if (divisions2.Count() > 0) diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index efe791f5..3d64d5ad 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -16849,7 +16849,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_DesignProfessional", Storage="_Base_DesignProfessional", ThisKey="CNProfessionalId", OtherKey="ToCN", DeleteRule="NO ACTION")] + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_CNProfessional", Storage="_Base_DesignProfessional", ThisKey="CNProfessionalId", OtherKey="ToCN", DeleteRule="NO ACTION")] public EntitySet Base_DesignProfessional { get @@ -18354,7 +18354,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_DesignProfessional", Storage="_Base_CNProfessional", ThisKey="ToCN", OtherKey="CNProfessionalId", IsForeignKey=true)] + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_DesignProfessional_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="ToCN", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { get @@ -383251,6 +383251,8 @@ namespace Model private string _YeZhu; + private string _CheckAcceptType; + private EntityRef _WBS_Division; #region 可扩展性方法定义 @@ -383291,6 +383293,8 @@ namespace Model partial void OnJianLiChanged(); partial void OnYeZhuChanging(string value); partial void OnYeZhuChanged(); + partial void OnCheckAcceptTypeChanging(string value); + partial void OnCheckAcceptTypeChanged(); #endregion public WBS_Breakdown() @@ -383643,6 +383647,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckAcceptType", DbType="Char(1)")] + public string CheckAcceptType + { + get + { + return this._CheckAcceptType; + } + set + { + if ((this._CheckAcceptType != value)) + { + this.OnCheckAcceptTypeChanging(value); + this.SendPropertyChanging(); + this._CheckAcceptType = value; + this.SendPropertyChanged("CheckAcceptType"); + this.OnCheckAcceptTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_Breakdown_WBS_Division", Storage="_WBS_Division", ThisKey="DivisionId", OtherKey="DivisionId", IsForeignKey=true)] public WBS_Division WBS_Division { @@ -387829,6 +387853,8 @@ namespace Model private string _CNProfessionalId; + private string _SubItemType; + private EntitySet _WBS_Breakdown; private EntityRef _Base_CNProfessional; @@ -387849,6 +387875,8 @@ namespace Model partial void OnSuperDivisionIdChanged(); partial void OnCNProfessionalIdChanging(string value); partial void OnCNProfessionalIdChanged(); + partial void OnSubItemTypeChanging(string value); + partial void OnSubItemTypeChanged(); #endregion public WBS_Division() @@ -387982,6 +388010,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubItemType", DbType="Char(1)")] + public string SubItemType + { + get + { + return this._SubItemType; + } + set + { + if ((this._SubItemType != value)) + { + this.OnSubItemTypeChanging(value); + this.SendPropertyChanging(); + this._SubItemType = value; + this.SendPropertyChanged("SubItemType"); + this.OnSubItemTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_Breakdown_WBS_Division", Storage="_WBS_Breakdown", ThisKey="DivisionId", OtherKey="DivisionId", DeleteRule="NO ACTION")] public EntitySet WBS_Breakdown {