From 0eedd04ad8bdab19daffa4723ad53e7f3d43ff31 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 14 Feb 2025 11:53:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SUBQHSE_V2025-02-12-gf.sql | 2 + SGGL/BLL/BLL.csproj | 2 + SGGL/BLL/JDGL/WBS/JDGLWBSDetailService.cs | 16 + SGGL/BLL/JDGL/WBS/JDGLWBSService.cs | 16 + SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx | 51 +-- .../JDGL/WBS/WBSSetAudit.aspx.cs | 405 +++++------------- .../JDGL/WBS/WBSSetAudit.aspx.designer.cs | 9 + .../ProjectData/Installation.aspx.cs | 13 +- SGGL/FineUIPro.Web/Web.config | 2 +- .../FineUIPro.Web/common/mainProject2.aspx.cs | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 11 files changed, 180 insertions(+), 340 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-02-12-gf.sql create mode 100644 SGGL/BLL/JDGL/WBS/JDGLWBSDetailService.cs create mode 100644 SGGL/BLL/JDGL/WBS/JDGLWBSService.cs diff --git a/DataBase/版本日志/SUBQHSE_V2025-02-12-gf.sql b/DataBase/版本日志/SUBQHSE_V2025-02-12-gf.sql new file mode 100644 index 00000000..665c0071 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-02-12-gf.sql @@ -0,0 +1,2 @@ +update Sys_Menu set MenuName='' where MenuId='858E83E9-ADE5-452E-BD65-82D8DFF872C0' +GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 399763c9..4a83317b 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -609,6 +609,8 @@ + + diff --git a/SGGL/BLL/JDGL/WBS/JDGLWBSDetailService.cs b/SGGL/BLL/JDGL/WBS/JDGLWBSDetailService.cs new file mode 100644 index 00000000..ad79333a --- /dev/null +++ b/SGGL/BLL/JDGL/WBS/JDGLWBSDetailService.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public static class JDGLWBSDetailService + { + public static List GetWBSDetailsByWorkPackageId(string workPackageId) + { + return (from x in Funs.DB.JDGL_WBSDetail where x.WorkPackageId == workPackageId select x).ToList(); + } + } +} diff --git a/SGGL/BLL/JDGL/WBS/JDGLWBSService.cs b/SGGL/BLL/JDGL/WBS/JDGLWBSService.cs new file mode 100644 index 00000000..22791380 --- /dev/null +++ b/SGGL/BLL/JDGL/WBS/JDGLWBSService.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public static class JDGLWBSService + { + public static List GetWBSsByProjectId(string projectId,string parentId) + { + return (from x in Funs.DB.JDGL_WBS where x.ParentId == parentId && x.ProjectId == projectId orderby x.PathCode select x).ToList(); + } + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx index 0175eb7e..665382ab 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx @@ -45,7 +45,7 @@ + Width="300px" Title="工作包及检测点" ShowBorder="true" ShowHeader="true" BodyPadding="10px" Layout="Fit"> + + @@ -80,43 +84,10 @@ - + - - - - - - - <%-- - - - - - - - - - - - - - - - - - --%> - diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.cs index 8505ad1e..31a8281c 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.cs @@ -37,31 +37,13 @@ namespace FineUIPro.Web.JDGL.WBS this.trWBS.EnableIcons = true; this.trWBS.AutoScroll = true; this.trWBS.EnableSingleClickExpand = true; - //var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); - //if (project != null) - //{ - // TreeNode rootNode = new TreeNode(); - // rootNode.Text = project.ProjectName; - // rootNode.NodeID = project.ProjectId; - // rootNode.CommandName = "project"; - // rootNode.EnableExpandEvent = true; - // rootNode.EnableCheckBox = false; - // this.trWBS.Nodes.Add(rootNode); - // if (BLL.Project_InstallationService.IsExitProjectInstallation(project.ProjectId)) - // { - // TreeNode emptyNode = new TreeNode(); - // emptyNode.Text = ""; - // emptyNode.NodeID = ""; - // rootNode.Nodes.Add(emptyNode); - // } - //} - Model.Project_Installation installation = BLL.Project_InstallationService.GetProjectInstallationByProjectId(this.CurrUser.LoginProjectId); - if (installation != null) + List wbss = BLL.JDGLWBSService.GetWBSsByProjectId(this.CurrUser.LoginProjectId, "0"); + foreach (var w in wbss) { TreeNode newNode = new TreeNode(); - newNode.Text = "[" + installation.InstallationCode + "]" + installation.InstallationName; - newNode.NodeID = installation.InstallationId; - newNode.CommandName = "installation"; + newNode.Text = w.ItemName; + newNode.NodeID = w.Id; + newNode.CommandName = "WBS"; newNode.EnableExpandEvent = true; newNode.EnableClickEvent = true; newNode.EnableCheckBox = false; @@ -84,255 +66,27 @@ namespace FineUIPro.Web.JDGL.WBS protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e) { e.Node.Nodes.Clear(); - bool needAddTempNode = false; //是否需要增加空节点 - if (e.Node.CommandName == "project") //展开项目节点 + if (e.Node.CommandName == "WBS") //展开项目节点 { - var installations = from x in Funs.DB.Project_Installation - where x.ProjectId == e.Node.NodeID && x.SuperInstallationId == "0" - orderby x.InstallationCode - select x; - foreach (var installation in installations) + var wbss = BLL.JDGLWBSService.GetWBSsByProjectId(this.CurrUser.LoginProjectId, e.Node.NodeID); + foreach (var w in wbss) { TreeNode newNode = new TreeNode(); - newNode.Text = "[" + installation.InstallationCode + "]" + installation.InstallationName; - newNode.NodeID = installation.InstallationId; - newNode.CommandName = "installation"; + newNode.Text = w.ItemName; + newNode.NodeID = w.Id; + newNode.CommandName = "WBS"; newNode.EnableExpandEvent = true; newNode.EnableClickEvent = true; newNode.EnableCheckBox = false; e.Node.Nodes.Add(newNode); - - TreeNode emptyNode = new TreeNode(); - emptyNode.Text = ""; - emptyNode.NodeID = ""; - newNode.Nodes.Add(emptyNode); - } - } - else if (e.Node.CommandName == "installation") //展开装置/单元节点 - { - var installations = from x in Funs.DB.Project_Installation - where x.SuperInstallationId == e.Node.NodeID - orderby x.InstallationCode - select x; - if (installations.Count() > 0) - { - foreach (var installation in installations) - { - TreeNode newNode = new TreeNode(); - newNode.Text = "[" + installation.InstallationCode + "]" + installation.InstallationName; - newNode.NodeID = installation.InstallationId; - newNode.CommandName = "installation"; - newNode.EnableExpandEvent = true; - newNode.EnableClickEvent = true; - newNode.EnableCheckBox = false; - e.Node.Nodes.Add(newNode); - - TreeNode emptyNode = new TreeNode(); - emptyNode.Text = ""; - emptyNode.NodeID = ""; - newNode.Nodes.Add(emptyNode); - } - } - else - { - var cnProfessions = from x in Funs.DB.WBS_CnProfession where x.InstallationId == e.Node.NodeID orderby x.OldId select x; - if (cnProfessions.Count() > 0) //普通装置主项 - { - foreach (var cnProfession in cnProfessions) - { - TreeNode newNode = new TreeNode(); - newNode.Text = cnProfession.CnProfessionName; - newNode.NodeID = cnProfession.CnProfessionId; - newNode.CommandName = "cnProfession"; - newNode.EnableExpandEvent = true; - newNode.EnableClickEvent = true; - newNode.EnableCheckBox = false; - e.Node.Nodes.Add(newNode); - TreeNode emptyNode = new TreeNode(); - emptyNode.Text = ""; - emptyNode.NodeID = ""; - newNode.Nodes.Add(emptyNode); - } - } - else //总图 - { - var unitProjects = from x in Funs.DB.Wbs_UnitProject where x.InstallationId == e.Node.NodeID && x.SuperUnitProjectId == null orderby x.SortIndex, x.UnitProjectCode select x; - foreach (var unitProject in unitProjects) - { - TreeNode newNode = new TreeNode(); - newNode.Text = unitProject.UnitProjectName; - newNode.NodeID = unitProject.UnitProjectId; - newNode.CommandName = "unitProject"; - newNode.EnableExpandEvent = true; - newNode.EnableCheckBox = false; - if (unitProject.IsSelected == true && unitProject.IsApprove == null) - { - unitProject.IsApprove = true; - BLL.UnitProjectService.UpdateUnitProject(unitProject); - } - if (unitProject.IsApprove == true) - { - newNode.Checked = true; - } - else - { - newNode.Checked = false; - } - newNode.EnableClickEvent = true; - e.Node.Nodes.Add(newNode); - TreeNode emptyNode = new TreeNode(); - emptyNode.Text = ""; - emptyNode.NodeID = ""; - newNode.Nodes.Add(emptyNode); - } - } - } - } - else if (e.Node.CommandName == "cnProfession") //展开专业节点 - { - var unitProjects = from x in Funs.DB.Wbs_UnitProject where x.CnProfessionId == e.Node.NodeID && x.SuperUnitProjectId == null orderby x.SortIndex, x.UnitProjectCode select x; - foreach (var unitProject in unitProjects) - { - TreeNode newNode = new TreeNode(); - newNode.Text = unitProject.UnitProjectName; - newNode.NodeID = unitProject.UnitProjectId; - newNode.CommandName = "unitProject"; - newNode.EnableExpandEvent = true; - newNode.EnableCheckBox = true; - newNode.EnableCheckEvent = true; - if (unitProject.IsSelected == true && unitProject.IsApprove == null) - { - unitProject.IsApprove = true; - BLL.UnitProjectService.UpdateUnitProject(unitProject); - } - if (unitProject.IsApprove == true) - { - newNode.Checked = true; - } - else - { - newNode.Checked = false; - } - newNode.EnableClickEvent = true; - e.Node.Nodes.Add(newNode); - TreeNode emptyNode = new TreeNode(); - emptyNode.Text = ""; - emptyNode.NodeID = ""; - newNode.Nodes.Add(emptyNode); - } - } - else if (e.Node.CommandName == "unitProject") //展开单位工程节点 - { - var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.UnitProjectId == e.Node.NodeID && x.SuperWbsSetId == null orderby x.WbsSetCode select x; - if (wbsSet1s.Count() > 0) - { - foreach (var wbsSet1 in wbsSet1s) - { - TreeNode newNode = new TreeNode(); - newNode.Text = wbsSet1.WbsSetName; - newNode.NodeID = wbsSet1.WbsSetId; - newNode.CommandName = "wbsSet"; - newNode.EnableExpandEvent = true; - newNode.EnableCheckBox = true; - newNode.EnableCheckEvent = true; - if (wbsSet1.IsSelected == true && wbsSet1.IsApprove == null) - { - wbsSet1.IsApprove = true; - BLL.WbsSetService.UpdateWbsSet(wbsSet1); - } - if (wbsSet1.IsApprove == true) - { - newNode.Checked = true; - } - else - { - newNode.Checked = false; - } - newNode.EnableClickEvent = true; - e.Node.Nodes.Add(newNode); - var wbsSets = BLL.WbsSetService.GetWbsSetsBySuperWbsSetId(wbsSet1.WbsSetId); - if (wbsSets.Count > 0) - { - TreeNode emptyNode = new TreeNode(); - emptyNode.Text = ""; - emptyNode.NodeID = ""; - newNode.Nodes.Add(emptyNode); - } - //needAddTempNode = false; - //var wbsSets = BLL.WbsSetService.GetWbsSetsBySuperWbsSetId(wbsSet1.WbsSetId); - //foreach (var wbsSet in wbsSets) - //{ - // var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == wbsSet.WbsSetId select x; - // if (childWbsSets.Count() > 0) - // { - // needAddTempNode = true; - // break; - // } - //} - //if (needAddTempNode) - //{ - // TreeNode emptyNode = new TreeNode(); - // emptyNode.Text = ""; - // emptyNode.NodeID = ""; - // newNode.Nodes.Add(emptyNode); - //} - } - } - } - else if (e.Node.CommandName == "wbsSet") //展开分部/子分部/分项/子分项工程节点 - { - var childWbsSets = BLL.WbsSetService.GetWbsSetsBySuperWbsSetId(e.Node.NodeID); - foreach (var wbsSet in childWbsSets) - { - TreeNode newNode = new TreeNode(); - newNode.Text = wbsSet.WbsSetName; - newNode.NodeID = wbsSet.WbsSetId; - newNode.CommandName = "wbsSet"; - newNode.EnableExpandEvent = true; - newNode.EnableCheckBox = true; - newNode.EnableCheckEvent = true; - - if (wbsSet.IsSelected == true && wbsSet.IsApprove == null) - { - wbsSet.IsApprove = true; - BLL.WbsSetService.UpdateWbsSet(wbsSet); - } - if (wbsSet.IsApprove == true) - { - newNode.Checked = true; - } - else - { - newNode.Checked = false; - } - newNode.EnableClickEvent = true; - e.Node.Nodes.Add(newNode); - var wbsSets = BLL.WbsSetService.GetWbsSetsBySuperWbsSetId(wbsSet.WbsSetId); - if (wbsSets.Count > 0) + var wbs2s = BLL.JDGLWBSService.GetWBSsByProjectId(this.CurrUser.LoginProjectId, w.Id); + if (wbs2s.Count > 0) { TreeNode emptyNode = new TreeNode(); emptyNode.Text = ""; emptyNode.NodeID = ""; newNode.Nodes.Add(emptyNode); } - //needAddTempNode = false; - //var wbsSets = BLL.WbsSetService.GetWbsSetsBySuperWbsSetId(wbsSet.WbsSetId); - //foreach (var wbsSetc in wbsSets) - //{ - // var childWbsSets1 = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == wbsSetc.WbsSetId select x; - // if (childWbsSets1.Count() > 0) - // { - // needAddTempNode = true; - // break; - // } - //} - //if (needAddTempNode) - //{ - // TreeNode emptyNode = new TreeNode(); - // emptyNode.Text = ""; - // emptyNode.NodeID = ""; - // newNode.Nodes.Add(emptyNode); - //} } } } @@ -1743,19 +1497,12 @@ namespace FineUIPro.Web.JDGL.WBS /// private void BindGrid() { - var codeList = BLL.WbsSetMatchCostControlService.GetWbsSetMatchCostControls(this.trWBS.SelectedNodeID); - Model.Wbs_WbsSet wbeSet = BLL.WbsSetService.GetWbsSetByWbsSetId(this.trWBS.SelectedNodeID); - if (codeList.Count > 0) //存在费控对应关系项 + var list = BLL.JDGLWBSDetailService.GetWBSDetailsByWorkPackageId(this.trWBS.SelectedNodeID); + if (list.Count > 0) { - string codes = string.Empty; - foreach (var item in codeList) - { - codes += item.CostControlCode + ","; - } - string strSql = "SELECT c.*,e.EquipmentMaterialTypeName FROM WBS_CostControl c left join WBS_EquipmentMaterialType e on c.EquipmentMaterialTypeId=e.EquipmentMaterialTypeId where @CostControlCodes like '%'+CostControlCode+'%' and WbsSetId=@WbsSetId"; + string strSql = "SELECT * FROM JDGL_WBSDetail where WorkPackageId=@WorkPackageId"; List listStr = new List(); - listStr.Add(new SqlParameter("@CostControlCodes", codes)); - listStr.Add(new SqlParameter("@WbsSetId", this.trWBS.SelectedNodeID)); + listStr.Add(new SqlParameter("@WorkPackageId", this.trWBS.SelectedNodeID)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); @@ -1764,12 +1511,6 @@ namespace FineUIPro.Web.JDGL.WBS Grid1.DataSource = table; Grid1.DataBind(); - var costControls = BLL.CostControlService.GetSelectedCostControlsByWbsSetId(this.trWBS.SelectedNodeID); - if (costControls.Count > 0) - { - var selectIds = costControls.Select(x => x.CostControlId).ToArray(); - this.Grid1.SelectedRowIDArray = selectIds; - } } else { @@ -2713,33 +2454,115 @@ namespace FineUIPro.Web.JDGL.WBS { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnMenuAdd.Hidden = false; - this.btnAdd.Hidden = false; - this.btnMenuCopy.Hidden = false; - //this.btnMenuDetail.Hidden = false; - //this.btnMenuWeekDetail.Hidden = false; - //this.btnMenuCopy2.Hidden = false; + //this.btnMenuAdd.Hidden = false; + //this.btnAdd.Hidden = false; + //this.btnMenuCopy.Hidden = false; + this.btnMenuDown.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { - this.btnMenuEdit.Hidden = false; - this.btnMenuModify.Hidden = false; + //this.btnMenuEdit.Hidden = false; + //this.btnMenuModify.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnDelete)) { - this.btnMenuDelete.Hidden = false; - this.btnMenuDel.Hidden = false; + //this.btnMenuDelete.Hidden = false; + //this.btnMenuDel.Hidden = false; } - //if (buttonList.Contains(BLL.Const.BtnAuditing)) - //{ - // this.btnMenuAudit.Hidden = false; - //} } } #endregion + + /// + /// 抽取 + /// + /// + /// + protected void btnMenuDown_Click(object sender, EventArgs e) + { + Model.SGGLDB db = Funs.DB; + Model.JDGL_WBS wbs1 = db.JDGL_WBS.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId); + if (wbs1 != null) + { + ShowNotify("项目已存在数据，无法抽取！", MessageBoxIcon.Warning); + return; + } + Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + string contenttype = "application/json;charset=utf-8"; + var returndata0 = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/project/api/hcoud-wuhuan/projectwbsconstruct/constructionTree?wuId=" + project.KZProjectCode, "GET", contenttype, null, null); + var returndata1 = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/project/api/hcoud-wuhuan/projectwbsconstruct/checkPointList?wuId=" + project.KZProjectCode, "GET", contenttype, null, null); + List wbss = new List(); + List wbsDetails = new List(); + if (!string.IsNullOrEmpty(returndata0)) + { + JObject obj0 = JObject.Parse(returndata0); + if (obj0["code"].ToString() == "200") + { + JArray arr0 = JArray.Parse(obj0["data"].ToString()); + string proId = string.Empty; + + List list = new List(); + foreach (var item in arr0) + { + Model.JDGL_WBS wBS = new Model.JDGL_WBS(); + wBS.Id = item["id"].ToString(); + wBS.ProjectId = this.CurrUser.LoginProjectId; + wBS.ParentId = item["parentId"].ToString(); + wBS.Leave = Funs.GetNewInt(item["leave"].ToString()); + wBS.PathCode = item["pathCode"].ToString(); + wBS.ItemName = item["itemName"].ToString(); + wBS.PlanQuantities = Funs.GetNewDecimal(item["planQuantities"].ToString()); + wBS.PlanEnd = Funs.GetNewDateTime(item["planEnd"].ToString()); + wBS.RealityEnd = Funs.GetNewDateTime(item["realityEnd"].ToString()); + wBS.RealityPrice = Funs.GetNewDecimal(item["realityPrice"].ToString()); + wBS.Total = Funs.GetNewDecimal(item["total"].ToString()); + wBS.Num = Funs.GetNewDecimal(item["num"].ToString()); + wBS.Cycle = item["cycle"].ToString(); + wBS.PlanPrice = Funs.GetNewDecimal(item["planPrice"].ToString()); + if (!list.Contains(wBS.Id)) + { + wbss.Add(wBS); + list.Add(wBS.Id); + } + } + //InitTreeMenu(); + } + } + if (!string.IsNullOrEmpty(returndata1)) + { + JObject obj0 = JObject.Parse(returndata1); + if (obj0["code"].ToString() == "200") + { + JArray arr0 = JArray.Parse(obj0["data"].ToString()); + string proId = string.Empty; + + List list = new List(); + foreach (var item in arr0) + { + Model.JDGL_WBSDetail wBSDetail = new Model.JDGL_WBSDetail(); + wBSDetail.Id = item["id"].ToString(); + wBSDetail.ProjectId = this.CurrUser.LoginProjectId; + wBSDetail.CompletionTime = Funs.GetNewDateTime(item["completionTime"].ToString()); + wBSDetail.WorkPackageId = item["workPackageId"].ToString(); + wBSDetail.Name = item["name"].ToString(); + wBSDetail.RealityCompletePercent = Funs.GetNewDecimal(item["realityCompletePercent"].ToString()); + if (!list.Contains(wBSDetail.Id)) + { + wbsDetails.Add(wBSDetail); + list.Add(wBSDetail.Id); + } + } + //InitTreeMenu(); + } + } + db.JDGL_WBS.InsertAllOnSubmit(wbss); + db.JDGL_WBSDetail.InsertAllOnSubmit(wbsDetails); + db.SubmitChanges(); + ShowNotify("抽取成功！", MessageBoxIcon.Success); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.designer.cs index f2dbc968..4322872c 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSetAudit.aspx.designer.cs @@ -102,6 +102,15 @@ namespace FineUIPro.Web.JDGL.WBS { /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// btnMenuDown 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnMenuDown; + /// /// btnAdd 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs index fa21d08c..2105818c 100644 --- a/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.ProjectData { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnMenuDown.Hidden = false; + //this.btnMenuDown.Hidden = false; this.btnMenuAdd.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) @@ -307,16 +307,17 @@ namespace FineUIPro.Web.ProjectData wBSDetail.WorkPackageId = item["workPackageId"].ToString(); wBSDetail.Name = item["name"].ToString(); wBSDetail.RealityCompletePercent = Funs.GetNewDecimal(item["realityCompletePercent"].ToString()); - //if (!list.Contains(wBS.Id)) - //{ - // wbss.Add(wBS); - // list.Add(wBS.Id); - //} + if (!list.Contains(wBSDetail.Id)) + { + wbsDetails.Add(wBSDetail); + list.Add(wBSDetail.Id); + } } //InitTreeMenu(); } } db.JDGL_WBS.InsertAllOnSubmit(wbss); + db.JDGL_WBSDetail.InsertAllOnSubmit(wbsDetails); db.SubmitChanges(); ShowNotify("抽取成功！", MessageBoxIcon.Success); } diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 6b0f037e..3821db51 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index f2606cd6..c478e6b4 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -441,7 +441,7 @@ namespace FineUIPro.Web.common /// protected int GetCompletedNum() { - var result = Project_HSSEData_HSSEService.GetCompletedNum(ProjectId); + var result = Project_HSSEData_HSSEService.GetFinishedNum(ProjectId); return result; } diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index d989db4f..59ad2199 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true From 80398775532167135cda4dc696a57f2f5ecfe64f Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 14 Feb 2025 15:21:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/FineUIPro.Web/Web.config | 2 +- .../FineUIPro.Web/common/mainProject2.aspx.cs | 2 +- SGGL/FineUIPro.Web/common/main_new.aspx.cs | 141 +++++++++++------- 4 files changed, 88 insertions(+), 59 deletions(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d84e1613..b937cbb9 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19357,7 +19357,7 @@ - + - + diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index c478e6b4..9f3cb957 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -481,7 +481,7 @@ namespace FineUIPro.Web.common /// protected int GetSuperCompletedNum() { - var result = Project_HSSEData_HSSEService.GetSuperCompletedNum(ProjectId); + var result = Project_HSSEData_HSSEService.GetSuperFinishedNum(ProjectId); return result; } diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs index a9ec355c..153fd18e 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs @@ -24,15 +24,16 @@ namespace FineUIPro.Web.common { pids = CurrUser.CompanyProjectId.Split(','); } - else { + else + { //加载所有在建项目的数据 - var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x=>x.ProjectId).ToArray(); - if (pidArray.Length>0) + var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray(); + if (pidArray.Length > 0) { pids = pidArray; } } - + //未遂事故 var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord @@ -52,21 +53,23 @@ namespace FineUIPro.Web.common { countAqrgsSum = CountAqrgs(); } - else { - countAqrgsSum = CountAqrgs(null,null,pids); + else + { + countAqrgsSum = CountAqrgs(null, null, pids); } - + if (countAqrgsSum > 10000) { countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00); this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万"; } - else { + else + { this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0]; } - + //本月安全人工时 //int wHoursMonth = 0; @@ -85,7 +88,7 @@ namespace FineUIPro.Web.common } else { - countMonthAqrgs = CountAqrgs(d1, d2,pids); + countMonthAqrgs = CountAqrgs(d1, d2, pids); } if (countMonthAqrgs > 10000) { @@ -93,7 +96,8 @@ namespace FineUIPro.Web.common this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万"; } - else { + else + { this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0]; } @@ -113,11 +117,12 @@ namespace FineUIPro.Web.common boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count; this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString(); } - else { - getTrainRecord = db.EduTrain_TrainRecord.Where(x=>pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0; + else + { + getTrainRecord = db.EduTrain_TrainRecord.Where(x => pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0; //修改：增加博晟教育中的人数 boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null) - && pids.Contains(x.ProjectId) ).ToList().Count; + && pids.Contains(x.ProjectId)).ToList().Count; this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString(); } @@ -137,7 +142,8 @@ namespace FineUIPro.Web.common select x; this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString(); } - else { + else + { //安全管理人员 var allSum = from x in Funs.DB.SitePerson_Person where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now) @@ -174,11 +180,12 @@ namespace FineUIPro.Web.common select x).Count(); divCqmsPxNum.InnerText = CqmsPxNum.ToString(); } - else { + else + { CqmsManageNum = (from x in Funs.DB.SitePerson_Person - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId) - select x).Count(); + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId) + select x).Count(); this.divCqmsManageNum.InnerText = CqmsManageNum.ToString(); CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson @@ -193,10 +200,11 @@ namespace FineUIPro.Web.common { allProjects = ProjectService.GetAllProjectDropDownList(); } - else { + else + { allProjects = ProjectService.GetAllProjectDropDownList(pids); } - + int acount = allProjects.Count(); int pcount1 = 0; int pcount2 = 0; @@ -205,10 +213,12 @@ namespace FineUIPro.Web.common { pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count(); var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(','); - if (pids == null) { + if (pids == null) + { pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count(); } - else { + else + { pidzjsg = pids; pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count(); } @@ -279,7 +289,7 @@ namespace FineUIPro.Web.common /// /// /// - protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null,string[] pids =null) + protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null, string[] pids = null) { decimal cout1 = 0; @@ -288,12 +298,13 @@ namespace FineUIPro.Web.common var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber select x; - if (pids != null) { + if (pids != null) + { getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber where pids.Contains(x.ProjectId) select x; } - if (getAllPersonInOutList.Count() > 0) + if (getAllPersonInOutList.Count() > 0) { if (datetime1.HasValue) { @@ -305,7 +316,16 @@ namespace FineUIPro.Web.common } if (getAllPersonInOutList.Count() > 0) { - cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours); + //cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours); + foreach (var pid in pids) + { + var q1 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InOutDate); + var q2 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderBy(x => x.InOutDate); + if (q1.Count() > 0) + { + cout1 += (q1.First().WorkHours ?? 0) - (q2.First().WorkHours ?? 0); + } + } } } @@ -318,15 +338,15 @@ namespace FineUIPro.Web.common where y.ProjectState == Const.ProjectState_1 select x; - if (pids!=null) + if (pids != null) { getD1 = from x in Funs.DB.Accident_AccidentHandle join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId - where pids.Contains(x.ProjectId) + where pids.Contains(x.ProjectId) select x; getD2 = from x in Funs.DB.Accident_AccidentReport join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId - where pids.Contains(x.ProjectId) + where pids.Contains(x.ProjectId) select x; } @@ -716,7 +736,8 @@ namespace FineUIPro.Web.common zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); } - else { + else + { zlallNumber = (from x in Funs.DB.Check_CheckControl where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId) select x).Count().ToString(); @@ -736,7 +757,7 @@ namespace FineUIPro.Web.common zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); } - + } #endregion @@ -764,7 +785,8 @@ namespace FineUIPro.Web.common zlgjzgl = zgl.ToString(); zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); } - else { + else + { var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement where pids.Contains(x.ProjectId) select x).Count(); @@ -780,7 +802,7 @@ namespace FineUIPro.Web.common zlgjzgl = zgl.ToString(); zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); } - + } #endregion @@ -799,7 +821,7 @@ namespace FineUIPro.Web.common double result = 0; Model.SGGLDB db = Funs.DB; var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x; - if (pids!=null) + if (pids != null) { ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && pids.Contains(x.ProjectId) select x; } @@ -886,7 +908,8 @@ namespace FineUIPro.Web.common select x).Count(); gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); } - else { + else + { //Check_JointCheck var znum = (from x in Funs.DB.GJSX where pids.Contains(x.ProjectId) @@ -913,7 +936,7 @@ namespace FineUIPro.Web.common select x).Count(); gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); } - + } #endregion @@ -928,8 +951,9 @@ namespace FineUIPro.Web.common { getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now); } - else { - getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now,pids); + else + { + getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now, pids); } AllCount = getallin.Count(); if (AllCount > 0) @@ -954,13 +978,14 @@ namespace FineUIPro.Web.common var list = new List(); if (pids == null) { - list= Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList(); + list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList(); } - else { + else + { list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList(); } - - + + foreach (var item in list) { ProjectPersonMc += "'" + item.ShortName + "',"; @@ -981,10 +1006,11 @@ namespace FineUIPro.Web.common { list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList(); } - else { + else + { list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList(); } - if (list.Count>0) + if (list.Count > 0) { foreach (var item in list) { @@ -994,7 +1020,7 @@ namespace FineUIPro.Web.common ProjectJd = ProjectJd.TrimEnd(','); ProjectMc = ProjectMc.TrimEnd(','); } - + } #endregion @@ -1011,28 +1037,29 @@ namespace FineUIPro.Web.common /// 获取隐患整改闭环项 /// /// - public int GetGeneralClosedNum() + public int GetGeneralClosedNum() { int result = 0; - if (pids==null) + if (pids == null) { result = (from x in Funs.DB.HSSE_Hazard_HazardRegister where x.States == "3" select x).Count(); } - else { + else + { result = (from x in Funs.DB.HSSE_Hazard_HazardRegister where x.States == "3" && pids.Contains(x.ProjectId) select x).Count(); } - + return result; } /// /// 获取隐患未整改完成项 /// /// - public int GetGeneralNotClosedNum() + public int GetGeneralNotClosedNum() { int result = 0; if (pids == null) @@ -1041,12 +1068,13 @@ namespace FineUIPro.Web.common where x.States != "3" select x).Count(); } - else { + else + { result = (from x in Funs.DB.HSSE_Hazard_HazardRegister where x.States != "3" && pids.Contains(x.ProjectId) select x).Count(); } - + return result; } #endregion @@ -1192,7 +1220,7 @@ namespace FineUIPro.Web.common /// 获取未遂事件数 /// /// - private int GetNearMissNum() + private int GetNearMissNum() { if (pids == null) { @@ -1202,7 +1230,8 @@ namespace FineUIPro.Web.common select x).Count(); return result; } - else { + else + { var result = (from x in Funs.DB.Accident_AccidentPersonRecord join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime @@ -1210,7 +1239,7 @@ namespace FineUIPro.Web.common select x).Count(); return result; } - + } } } \ No newline at end of file From d7504526a4aa3b2456b0007a8d0ae786d67b0f5e Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 17 Feb 2025 12:15:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1=E7=A7=BB=E4=BA=A4=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../Transfer/CivilStructureDataIn.aspx.cs | 8 ++++---- .../Transfer/CivilStructureEdit.aspx.cs | 10 +++++----- .../Transfer/ElectricalDataIn.aspx.cs | 8 ++++---- .../FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs | 8 ++++---- .../Transfer/InstrumentationDataIn.aspx.cs | 15 ++++++++------- .../Transfer/InstrumentationEdit.aspx.cs | 8 ++++---- SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs | 8 ++++---- SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs | 8 ++++---- .../Transfer/RotatingEquipmentDataIn.aspx.cs | 8 ++++---- .../Transfer/RotatingEquipmentEdit.aspx.cs | 8 ++++---- .../Transfer/StaticEquipmentDataIn.aspx.cs | 8 ++++---- .../Transfer/StaticEquipmentEdit.aspx.cs | 8 ++++---- SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs | 8 ++++---- SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs | 8 ++++---- SGGL/FineUIPro.Web/Web.config | 4 ++-- 16 files changed, 64 insertions(+), 63 deletions(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b937cbb9..d84e1613 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19357,7 +19357,7 @@ - + - + @@ -77,7 +77,7 @@ - + From bf6a0fea2bfaa1b7e6469d5102ebc865908a5c3e Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 17 Feb 2025 14:03:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/OpenService/MonitorService.cs | 5 +++-- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/FineUIPro.Web/Web.config | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index be248aad..1949ea33 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -2179,7 +2179,7 @@ namespace BLL //////推送订阅消息 GetDataService.SendSubscribeMessage(); GetDataService.CorrectingPersonInOutNumber(null); - + } #region 启动监视器 定时每天执行 获取指定项目管道焊接工程量等信息 @@ -2230,7 +2230,8 @@ namespace BLL } finally { - getPipelineWeldingQuantities.Interval = 1000 * 3600 * 24; + //getPipelineWeldingQuantities.Interval = 1000 * 3600 * 24; + getPipelineWeldingQuantities.Interval = 1000 * 3600 * 12; getPipelineWeldingQuantities.Start(); } } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d84e1613..b937cbb9 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19357,7 +19357,7 @@ - +