diff --git a/DataBase/版本日志/SGGLDB_V2023-10-26.sql b/DataBase/版本日志/SGGLDB_V2023-10-26.sql new file mode 100644 index 00000000..ba1081c6 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-26.sql @@ -0,0 +1,22 @@ + +exec sp_rename 'dbo.Base_DNCompare.Sch5S', SCH5S, 'COLUMN' +go + +exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN' +go +alter table dbo.WBS_UnitWork + drop constraint FK_WBS_UnitWork_Base_Unit_Unit +go + +alter table dbo.HJGL_Pipeline + drop constraint FK_HJGL_Pipeline_Base_Unit +go + +alter table dbo.WBS_UnitWork + alter column UnitId nvarchar(300) null +go +alter table dbo.HJGL_Pipeline + alter column UnitId nvarchar(300) null +go + + diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index a28964ea..8d53c09b 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.UI.WebControls; +using Model; namespace BLL { @@ -439,7 +440,17 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } - + public static void InitUnitDropDownListByUnitIds(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease) + { + dropName.DataValueField = "UnitId"; + dropName.DataTextField = "UnitName"; + dropName.DataSource = BLL.UnitService.getUnitByUnitIds(unitId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } /// /// 根据项目Id获取单位名称下拉选择项（不包含某个单位） /// @@ -757,5 +768,10 @@ namespace BLL { return Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitName == unitName); } + + public static List getUnitByUnitIds(string unitids) + { + return Funs.DB.Base_Unit.Where(e => unitids.Contains(e.UnitId)).ToList(); + } } } diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs index 23dc6690..8c4fa55f 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs @@ -63,33 +63,19 @@ namespace FineUIPro.Web.HJGL.DataImport List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { - unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); - unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); + unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; //tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); } @@ -98,13 +84,12 @@ namespace FineUIPro.Web.HJGL.DataImport { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; //tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs index 0912557b..bb7efb04 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs @@ -119,11 +119,11 @@ namespace FineUIPro.Web.HJGL.DataImport // where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId // && y.MaterialCode.Contains(txtMaterialCode.Text.Trim()) // select x.PipelineId).Distinct().Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.EnableExpandEvent = true; rootNode1.Nodes.Add(tn1); @@ -178,7 +178,7 @@ namespace FineUIPro.Web.HJGL.DataImport // where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId // && y.MaterialCode.Contains(txtMaterialCode.Text.Trim()) // select x.PipelineId).Distinct().Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; @@ -186,7 +186,7 @@ namespace FineUIPro.Web.HJGL.DataImport //{ // tn2.Expanded = true; //} - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableExpandEvent = true; tn2.EnableClickEvent = true; diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs index f95a4068..be93ea06 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs @@ -62,33 +62,20 @@ namespace FineUIPro.Web.HJGL.DataImport List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { - unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); - unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); + unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; //tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); } @@ -98,12 +85,12 @@ namespace FineUIPro.Web.HJGL.DataImport foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; //tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs index 5e181350..eb70059b 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs @@ -77,32 +77,19 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { - unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); - unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); + unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; rootNode1.Nodes.Add(tn1); BindNodes(tn1); } @@ -112,11 +99,11 @@ namespace FineUIPro.Web.HJGL.HotProcessHard foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; rootNode2.Nodes.Add(tn2); BindNodes(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs index 73e8f774..a432bf2c 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs @@ -108,7 +108,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = trustItems.Count() - reportItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; if (num > 0) @@ -132,7 +131,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = trustItems.Count() - reportItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; if (num > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs index 9118787b..bc7b3c4b 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs @@ -143,7 +143,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = reportItems.Count() - trustItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; if (num > 0) @@ -168,7 +167,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = reportItems.Count() - trustItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; if (num > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx index a4511de1..6d58c679 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx @@ -50,7 +50,7 @@ Required="true" runat="server" LabelWidth="190px" FocusOnPageLoad="true"> + ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="190px" > diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs index d3ee800b..2acb4c1e 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs @@ -115,10 +115,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard if (!string.IsNullOrEmpty(unitWorkId)) { var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); - if (w.UnitId != null) - { - drpHardTrustUnit.SelectedValue = w.UnitId; - } if (w.NDEUnit != null) { drpCheckUnit.SelectedValue = w.NDEUnit; diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs index 1823441b..b5de9ec2 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs @@ -77,9 +77,10 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - + unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); + unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + /*if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) { unitWork1 = (from x in unitWorkList where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" @@ -90,20 +91,19 @@ namespace FineUIPro.Web.HJGL.HotProcessHard } else { - unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); - unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + + }*/ if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; rootNode1.Nodes.Add(tn1); BindNodes(tn1); } @@ -113,11 +113,11 @@ namespace FineUIPro.Web.HJGL.HotProcessHard foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; rootNode2.Nodes.Add(tn2); BindNodes(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs index 7ca825c2..0b17444c 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs @@ -110,7 +110,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = trustItems.Count() - reportItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; if (num > 0) @@ -134,7 +133,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard var trustItems = (from x in TrustItemList where x.UnitWorkId == q.UnitWorkId select x).ToList(); var reportItems = (from x in ReportList where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = trustItems.Count() - reportItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; if (num > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs index 25df1a1e..5e72e231 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs @@ -153,7 +153,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = weldJoints.Count() - trustItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; if (num > 0) @@ -182,7 +181,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard where x.UnitWorkId == q.UnitWorkId select x).ToList(); int num = weldJoints.Count() - trustItems.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; if (num > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx index 827852f5..09c09b99 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx @@ -51,7 +51,7 @@ LabelWidth="180px"> + ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"> diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx.cs index 87c6553d..8149fa12 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustEdit.aspx.cs @@ -106,7 +106,6 @@ namespace FineUIPro.Web.HJGL.HotProcessHard if (!string.IsNullOrEmpty(unitWorkId)) { var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); - drpUnitId.SelectedValue = w.UnitId; this.drpUnitWork.SelectedValue = w.UnitWorkId; } diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 6fb7b129..2844aa2d 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -154,11 +154,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.EnableClickEvent = true; tn1.EnableExpandEvent = true; @@ -186,7 +186,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; @@ -194,7 +194,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery { tn2.Expanded = true; } - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableClickEvent = true; tn2.EnableExpandEvent = true; diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index d113bbc9..71dfc259 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -102,11 +102,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); } @@ -116,11 +116,11 @@ namespace FineUIPro.Web.HJGL.InfoQuery foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs index 76c8f3c2..5512509a 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs @@ -98,31 +98,31 @@ namespace FineUIPro.Web.HJGL.LeakVacuum List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + // } if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -134,11 +134,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs index 32d5d259..6da2b522 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs @@ -96,31 +96,31 @@ namespace FineUIPro.Web.HJGL.LeakVacuum List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -132,11 +132,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs index 828ba40e..2e47bb06 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs @@ -96,31 +96,31 @@ namespace FineUIPro.Web.HJGL.LeakVacuum List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + // } if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -132,11 +132,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var LeakVacuumUnitList = LeakVacuumLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs index f2b88799..f48481a4 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs @@ -100,11 +100,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); @@ -117,11 +117,11 @@ namespace FineUIPro.Web.HJGL.LeakVacuum foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx index efceb970..766dd967 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx @@ -24,7 +24,7 @@ + > diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx.cs index 4c286ab6..f88d3b7b 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumItemEdit.aspx.cs @@ -106,7 +106,6 @@ namespace FineUIPro.Web.HJGL.LeakVacuum if (!string.IsNullOrEmpty(unitWorkId)) { var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); - drpUnit.SelectedValue = w.UnitId; this.drpUnitWork.SelectedValue = w.UnitWorkId; } } diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs index 1357380d..382b59c3 100644 --- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs @@ -157,11 +157,11 @@ namespace FineUIPro.Web.HJGL.NDT foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableClickEvent = true; tn1.EnableExpandEvent = true; @@ -174,11 +174,11 @@ namespace FineUIPro.Web.HJGL.NDT foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var getUnitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + getUnitNamesUnitIds; tn2.CommandName = "单位工程"; tn2.EnableClickEvent = true; tn2.EnableExpandEvent = true; diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index cb7f9fb9..1a89b9e4 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -101,11 +101,11 @@ namespace FineUIPro.Web.HJGL.PointTrust foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableExpandEvent = true; rootNode1.Nodes.Add(tn1); @@ -117,11 +117,11 @@ namespace FineUIPro.Web.HJGL.PointTrust foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableExpandEvent = true; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs index b635ce52..5759a0ad 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs @@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.PointTrust foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableExpandEvent = true; rootNode1.Nodes.Add(tn1); @@ -94,11 +94,11 @@ namespace FineUIPro.Web.HJGL.PointTrust foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableExpandEvent = true; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index be81ca9e..62beeb15 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -119,11 +119,11 @@ namespace FineUIPro.Web.HJGL.PreDesign foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); } @@ -133,11 +133,11 @@ namespace FineUIPro.Web.HJGL.PreDesign foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 4aea321d..d583e41d 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -86,11 +86,11 @@ namespace FineUIPro.Web.HJGL.PreDesign foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = 1+"|"+Funs.GetEndPageNumber(a, pageSize); tn1.EnableClickEvent = true; tn1.EnableExpandEvent = true; @@ -114,7 +114,7 @@ namespace FineUIPro.Web.HJGL.PreDesign foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; @@ -122,7 +122,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { tn2.Expanded = true; } - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableClickEvent = true; tn2.EnableExpandEvent = true; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs index a2c36c67..3849deae 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs @@ -121,11 +121,11 @@ namespace FineUIPro.Web.HJGL.PreDesign { //int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); if (a > 0) @@ -139,13 +139,13 @@ namespace FineUIPro.Web.HJGL.PreDesign foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId==q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; // tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName ; tn2.CommandName = "主项"; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); if (a>0) diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs index ce9f4abf..dea619c3 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs @@ -98,31 +98,31 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var PurgingCleaningUnitList = PurgingCleaningLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -134,11 +134,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var PurgingCleaningUnitList = PurgingCleaningLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs index 452588df..7b7829c2 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs @@ -96,31 +96,31 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -132,11 +132,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs index d47e2b8e..2ce59dfb 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs @@ -96,31 +96,30 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -131,12 +130,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var PurgingCleaningUnitList = PurgingCleaning.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs index c2d32771..47480e27 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs @@ -101,11 +101,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); @@ -118,11 +118,11 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx index 168b8986..e9d28717 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx @@ -24,7 +24,7 @@ + > diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx.cs index 8b51c189..4b65a0ba 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningItemEdit.aspx.cs @@ -105,7 +105,6 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning if (!string.IsNullOrEmpty(unitWorkId)) { var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); - drpUnit.SelectedValue = w.UnitId; this.drpUnitWork.SelectedValue = w.UnitWorkId; } } diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs index 92173db4..7236e679 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs @@ -201,11 +201,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); BindNodes(tn1); @@ -216,11 +216,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); BindNodes(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs index 64bfe97e..c875c2bf 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs @@ -76,12 +76,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableExpandEvent = true; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); @@ -92,12 +91,11 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableExpandEvent = true; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs index 4bf1df99..0881b956 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs @@ -99,31 +99,30 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -134,12 +133,11 @@ namespace FineUIPro.Web.HJGL.TestPackage { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs index 03aff233..f6bb4697 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs @@ -119,12 +119,11 @@ namespace FineUIPro.Web.HJGL.TestPackage { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); @@ -136,12 +135,11 @@ namespace FineUIPro.Web.HJGL.TestPackage { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; tn2.ToolTip = "试压包存在未闭合尾项记录红色提醒，存在流程未闭合记录黄色提醒"; tn2.EnableClickEvent = true; diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs index 2f560e8b..f9d01d85 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs @@ -113,11 +113,11 @@ namespace FineUIPro.Web.HJGL.TestPackage foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -129,11 +129,11 @@ namespace FineUIPro.Web.HJGL.TestPackage foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs index 92eb0d36..4e160bba 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs @@ -163,11 +163,11 @@ foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; rootNode1.Nodes.Add(tn1); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); @@ -179,11 +179,11 @@ foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; rootNode2.Nodes.Add(tn2); var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList(); diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs index c740f07f..9c99a3f2 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs @@ -120,12 +120,11 @@ namespace FineUIPro.Web.HJGL.TestPackage { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "单位工程"; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); @@ -137,12 +136,11 @@ namespace FineUIPro.Web.HJGL.TestPackage { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "单位工程"; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs index fb61886b..2fc8c47e 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageItemEdit.aspx.cs @@ -126,7 +126,6 @@ namespace FineUIPro.Web.HJGL.TestPackage if (!string.IsNullOrEmpty(unitWorkId)) { var w = BLL.UnitWorkService.getUnitWorkByUnitWorkId(unitWorkId); - drpUnit.SelectedValue = w.UnitId; this.drpUnitWork.SelectedValue = w.UnitWorkId; } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index 88e201d5..a57814cb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -84,11 +84,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.EnableClickEvent = true; tn1.EnableExpandEvent = true; @@ -108,7 +108,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; @@ -116,7 +116,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { tn2.Expanded = true; } - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableClickEvent = true; tn2.EnableExpandEvent = true; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx index 5a56464d..caedf17b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx @@ -41,9 +41,10 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.cs index 6482ba8f..1918eafd 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.cs @@ -79,6 +79,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (!IsPostBack) { this.PipelineId = Request.Params["PipelineId"]; + Base_MediumService.InitMediumDropDownList(this.drpMedium, this.CurrUser.LoginProjectId, true); Base_TestMediumService.InitMediumDropDownList(this.drpTestMedium, "1", true); @@ -89,6 +90,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage Base_TestMediumService.InitMediumDropDownList(this.drpLeakMedium, "2", true); Base_PurgeMethodService.InitPurgeMethodDropDownList(this.drpPCMedium, true, "-请选择-"); BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial, true, "请选择");//材质1 + Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", this.CurrUser.LoginProjectId); if (pressUnit != null && pressUnit.SetValue == "2") { @@ -99,12 +101,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage } if (!string.IsNullOrEmpty(this.PipelineId)) { + + Model.View_HJGL_Pipeline pipeline = BLL.PipelineService.GetViewPipelineByPipelineId(this.PipelineId); + BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWorkService.getUnitWorkByUnitWorkId(pipeline.UnitWorkId).UnitId, true);//单位 this.ProjectId = pipeline.ProjectId; this.UnitId = pipeline.UnitId; this.UnitWorkId = pipeline.UnitWorkId; this.txtPipelineCode.Text = pipeline.PipelineCode; - this.txtUnitName.Text = pipeline.UnitName; + //this.txtUnitName.Text = pipeline.UnitName; + drpUnit.SelectedValue=pipeline.UnitId; this.txtSingleName.Text = pipeline.SingleName; if (!string.IsNullOrEmpty(pipeline.MediumId)) @@ -181,12 +187,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage { this.UnitWorkId = Request.Params["UnitWorkId"]; Model.WBS_UnitWork workArea = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId); + BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, workArea.UnitId, false);//单位 if (workArea != null) { - this.ProjectId = workArea.ProjectId; - this.UnitId = workArea.UnitId; + this.ProjectId = workArea.ProjectId; //this.InstallationId = workArea.InstallationId; - this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(this.UnitId); + } } } @@ -229,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline(); pipeline.ProjectId = this.ProjectId; //pipeline.InstallationId = this.InstallationId; - pipeline.UnitId = this.UnitId; + pipeline.UnitId = drpUnit.SelectedValue; pipeline.UnitWorkId = this.UnitWorkId; pipeline.PipelineCode = this.txtPipelineCode.Text.Trim(); if (this.drpDetectionRate.SelectedValue != BLL.Const._Null) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.designer.cs index d56324cc..8cd36f6a 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingManage { - - - public partial class PipelineEdit { - +namespace FineUIPro.Web.HJGL.WeldingManage +{ + + + public partial class PipelineEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelCenterRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// ToolbarFill1 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// SimpleForm1 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtPipelineCode 控件。 /// @@ -92,16 +94,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPipelineCode; - + /// - /// txtUnitName 控件。 + /// drpUnit 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtUnitName; - + protected global::FineUIPro.DropDownList drpUnit; + /// /// txtSingleName 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSingleName; - + /// /// txtSingleNumber 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSingleNumber; - + /// /// drpMedium 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpMedium; - + /// /// drpPipingClass 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPipingClass; - + /// /// drpDetectionRate 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpDetectionRate; - + /// /// drpDetectionType 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpDetectionType; - + /// /// numDesignTemperature 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox numDesignTemperature; - + /// /// numDesignPress 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox numDesignPress; - + /// /// drpTestMedium 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpTestMedium; - + /// /// numTestPressure 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox numTestPressure; - + /// /// drpPressurePipingClass 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPressurePipingClass; - + /// /// numPipeLenth 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox numPipeLenth; - + /// /// drpLeakMedium 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpLeakMedium; - + /// /// numLeakPressure 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox numLeakPressure; - + /// /// drpPCMedium 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPCMedium; - + /// /// numVacuumPressure 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox numVacuumPressure; - + /// /// drpMaterial 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpMaterial; - + /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs index 243fadc5..911799ca 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs @@ -66,31 +66,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + // } if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); } @@ -100,11 +100,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs index 4540e14c..69a43531 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs @@ -59,31 +59,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var u = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + u; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); } @@ -93,11 +93,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork2) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var u = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + u; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index 67fcbfb0..d15d72fb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -82,9 +82,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index 47f0ee9b..4c251b90 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -16,17 +16,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// /// 单位主键 /// - public string UnitId - { - get - { - return (string)ViewState["UnitId"]; - } - set - { - ViewState["UnitId"] = value; - } - } + //public string UnitId + //{ + // get + // { + // return (string)ViewState["UnitId"]; + // } + // set + // { + // ViewState["UnitId"] = value; + // } + //} /// /// 单位工程主键 /// @@ -121,16 +121,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage string strList = Request.Params["strList"]; List list = Funs.GetStrListByStr(strList, '|'); - if (list.Count() == 3) + if (list.Count() == 2) { this.UnitWorkId = list[0]; - this.UnitId = list[1]; - Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(this.UnitId); - if (unit != null) - { - this.txtUnitName.Text = unit.UnitName; - } - TaskDate = list[2]; + TaskDate = list[1]; + + + Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId); + BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位 + if (!string.IsNullOrEmpty(TaskDate)) { txtTaskDate.Text = TaskDate; @@ -142,13 +141,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (task != null) { txtTaskCode.Text = task.TaskCode; + drpUnit.SelectedValue = task.UnitId; } txtTaskCode.Enabled = false; } string projectId = string.Empty; - Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId); + if (UnitWorkId != null) - { + { + projectId = UnitWork.ProjectId; this.txtUnitWorkName.Text = UnitWork.UnitWorkName; } @@ -165,8 +166,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage private void InitTreeMenu() { this.tvControlItem.Nodes.Clear(); - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_SHOP && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count(); - int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.PipeArea == PipelineService.PipeArea_SHOP && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count(); + int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.PipeArea == PipelineService.PipeArea_FIELD && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count(); TreeNode rootNode1 = new TreeNode(); rootNode1.NodeID = BLL.PipelineService.PipeArea_SHOP; @@ -203,7 +204,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage var pipeline = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId - && x.UnitId == this.UnitId && x.PipeArea == PipeArea && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); @@ -477,7 +477,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask(); NewTask.ProjectId = this.CurrUser.LoginProjectId; NewTask.UnitWorkId = this.UnitWorkId; - NewTask.UnitId = this.UnitId; + NewTask.UnitId = drpUnit.SelectedValue; NewTask.TaskCode = this.txtTaskCode.Text.Trim(); NewTask.WeldTaskId = SQLHelper.GetNewID(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs index d875efa7..24315e1a 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingManage { - - - public partial class SelectTaskWeldJoint { - +namespace FineUIPro.Web.HJGL.WeldingManage +{ + + + public partial class SelectTaskWeldJoint + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtPipelineCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPipelineCode; - + /// /// btnQuery 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnQuery; - + /// /// tvControlItem 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar3 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// drpJointAttribute 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpJointAttribute; - + /// /// drpWeldTypeCode 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldTypeCode; - + /// /// Grid1 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpWeldingLocation 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldingLocation; - + /// /// txtTaskDate 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtTaskDate; - + /// /// txtTaskCode 控件。 /// @@ -164,16 +166,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTaskCode; - + /// - /// txtUnitName 控件。 + /// drpUnit 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtUnitName; - + protected global::FineUIPro.DropDownList drpUnit; + /// /// txtUnitWorkName 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitWorkName; - + /// /// drpWeldingMode 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWeldingMode; - + /// /// ToolbarFill1 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnAccept 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 76bcebb3..10b5c993 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -120,11 +120,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork1) { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.EnableExpandEvent = true; tn1.EnableClickEvent = true; @@ -146,7 +146,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; @@ -154,7 +154,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage //{ // tn2.Expanded = true; //} - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableExpandEvent = true; tn2.EnableClickEvent= true; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index bd909b93..8719219b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -102,11 +102,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage { int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn1.EnableExpandEvent = true; rootNode1.Nodes.Add(tn1); @@ -127,7 +127,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); // var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(q.UnitWorkId); //int a = NowComPipelineCode.Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; @@ -135,7 +135,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { tn2.Expanded = true; } - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableExpandEvent = true; tn2.EnableClickEvent= true; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index 6d985624..b22b1369 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs @@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork1) { - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName; - tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.CommandName = "UnitWork"; rootNode1.Nodes.Add(tn1); BindNodes(tn1); @@ -92,11 +92,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork2) { - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; tn2.Text = q.UnitWorkName; - tn2.ToolTip = "施工单位：" + u.UnitName; + tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.CommandName = "UnitWork"; rootNode2.Nodes.Add(tn2); BindNodes(tn2); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx index c74bda6c..22c2cb32 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx @@ -52,7 +52,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs index 1974c31e..c5c9abdb 100644 --- a/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs @@ -56,7 +56,7 @@ namespace FineUIPro.Web.ProjectData } if (!string.IsNullOrEmpty(UnitWork.UnitId)) { - this.drpUnit.SelectedValue = UnitWork.UnitId; + this.drpUnit.SelectedValueArray = UnitWork.UnitId.Split(','); } if (!string.IsNullOrEmpty(UnitWork.SupervisorUnitId)) { @@ -101,7 +101,7 @@ namespace FineUIPro.Web.ProjectData UnitWork.UnitWorkName = this.txtUnitWorkName.Text.Trim(); if (this.drpUnit.SelectedValue != BLL.Const._Null) { - UnitWork.UnitId = this.drpUnit.SelectedValue; + UnitWork.UnitId =string.Join(",", this.drpUnit.SelectedValueArray) ; } else { diff --git a/SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs index 803997c4..5944b1fb 100644 --- a/SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.ProjectData } if (!string.IsNullOrEmpty(UnitWork.UnitId)) { - this.txtUnit.Text = UnitService.GetUnitNameByUnitId(UnitWork.UnitId); + this.txtUnit.Text = UnitService.getUnitNamesUnitIds(UnitWork.UnitId); } if (!string.IsNullOrEmpty(UnitWork.SupervisorUnitId)) {