diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo index fb786c57..af66e84d 100644 Binary files a/.vs/SGGL_CWCEC/v17/.wsuo and b/.vs/SGGL_CWCEC/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-27.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-27.sql new file mode 100644 index 00000000..426ff131 Binary files /dev/null and b/DataBase/版本日志/SGGLDB_WH_2023-09-27.sql differ diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx index 760af10e..7029b04a 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx @@ -110,7 +110,7 @@ - +
1、本月主要工作内容 @@ -161,7 +161,7 @@
- +
2、本月质量问题处理情况 @@ -173,7 +173,7 @@
- +
 1）原材料问题 @@ -257,7 +257,7 @@
- +
 2）施工过程问题 @@ -343,7 +343,7 @@
- + - + - + @@ -416,7 +416,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -506,7 +506,7 @@ - + - + - + - + - +
3、本月质量控制 @@ -355,7 +355,7 @@
- +
 1）综合管理 @@ -395,13 +395,13 @@
 2）检验批统计
 土建：
 设备：
 管道：
 电气：
 仪表：
 防腐：
 消防：
 3）无损检测统计 @@ -523,7 +523,7 @@
 4）NCR统计 @@ -531,6 +531,7 @@
+ @@ -540,7 +541,7 @@
 5）设计变更统计 @@ -557,7 +558,7 @@
 6）合格焊工统计 @@ -574,7 +575,7 @@
 7）施工方案统计 @@ -594,7 +595,7 @@
- +
4、下月质量控制重点 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs index 3d4bdc5c..13dd9b26 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs @@ -96,8 +96,9 @@ namespace FineUIPro.Web.CQMS.ManageReport } else { - this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)); + + this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"])? string.Format("{0:yyyy-MM-dd}", DateTime.Now): Request.Params["startdate"]; + this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)): Request.Params["enddate"]; //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00"); //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00"); } @@ -1272,19 +1273,26 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) { - CheckLotBindStatisc("CV");//检验批统计:土建 - CheckLotBindStatisc("EQ");//检验批统计:设备 - CheckLotBindStatisc("PP");//检验批统计:管道 - CheckLotBindStatisc("EL");//检验批统计:电气 - CheckLotBindStatisc("IN");//检验批统计:仪表 - CheckLotBindStatisc("FF");//检验批统计:反腐 - CheckLotBindStatisc("XF");//检验批统计:消防 - GetComprehensive();//综合管理 - BindStatisc();//无损检测统计 - NCRBindStatisc();//NCR统计 - DesignChangeOrderBindStatisc();//设计变更统计 - PassWelderBindStatisc();//合格焊工统计 - ConstructionStatisticsr();//施工方案统计 + //CheckLotBindStatisc("CV");//检验批统计:土建 + //CheckLotBindStatisc("EQ");//检验批统计:设备 + //CheckLotBindStatisc("PP");//检验批统计:管道 + //CheckLotBindStatisc("EL");//检验批统计:电气 + //CheckLotBindStatisc("IN");//检验批统计:仪表 + //CheckLotBindStatisc("FF");//检验批统计:反腐 + //CheckLotBindStatisc("XF");//检验批统计:消防 + //GetComprehensive();//综合管理 + //BindStatisc();//无损检测统计 + //NCRBindStatisc();//NCR统计 + //DesignChangeOrderBindStatisc();//设计变更统计 + //PassWelderBindStatisc();//合格焊工统计 + //ConstructionStatisticsr();//施工方案统计 + //Response.AddHeader("Refresh", "0"); + string url = Request.Url.ToString(); + if (url.Contains("?")) + { + url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?')); + } + Response.Redirect(url + "?startdate="+txtStartDate.Text+"&enddate="+txtEndDate.Text); } } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs index 2c70c57e..2420da5e 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs @@ -59,6 +59,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (!IsPostBack) { + this.EnableViewState = true; this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName; this.ReportId = Request.Params["reportId"]; if (!string.IsNullOrEmpty(Request.Params["view"])) @@ -87,15 +88,18 @@ namespace FineUIPro.Web.CQMS.ManageReport //this.txtPeriod.ReadOnly = true; //this.txtStartDate.Enabled = false; //this.txtEndDate.Enabled = false; - GetThisWeekOrMonthContentList(this.ReportId);//本周主要工作内容 + GetThisWeekOrMonthContentList(this.ReportId);//本月主要工作内容 GetRowMaterialProblemList(this.ReportId);//原材料问题 GetConstructionProblemsList(this.ReportId);//施工过程问题 - GetNextQualityControlList(this.ReportId);//下周质量控制重点 + GetNextQualityControlList(this.ReportId);//下月质量控制重点 } else { - this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)); - this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + + this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"]; + this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now ): Request.Params["enddate"]; + //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00"); + //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00"); } CheckLotBindStatisc("CV");//检验批统计:土建 CheckLotBindStatisc("EQ");//检验批统计:设备 @@ -110,7 +114,6 @@ namespace FineUIPro.Web.CQMS.ManageReport DesignChangeOrderBindStatisc();//设计变更统计 PassWelderBindStatisc();//合格焊工统计 ConstructionStatisticsr();//施工方案统计 - } } @@ -119,23 +122,29 @@ namespace FineUIPro.Web.CQMS.ManageReport /// private void GetComprehensive() { - int count = 0; + decimal? count = 0; var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList(); foreach (var item in inspectionEquipments) { count += Funs.GetNewIntOrZero(item.Counts); } - //this.txt1.Text = Convert.ToString(count); this.txt3.Text = Convert.ToString(count); - int thisWeekCount = 0; + decimal? thisWeekCount = 0; var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList(); foreach (var item in equpments) { thisWeekCount += Funs.GetNewIntOrZero(item.Counts); } this.txt2.Text = Convert.ToString(thisWeekCount); - + //if (Convert.ToDecimal(this.txt3.Text.Trim()) > 0) + //{ + // this.txt4.Text = Math.Round((double)(Convert.ToDecimal(this.txt2.Text.Trim()) / Convert.ToDecimal(this.txt3.Text.Trim())) * 100, 2) + "%"; + //} + //else + //{ + // this.txt4.Text = "0"; + //} var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.EquipmentOrMatail == "材料" @@ -209,7 +218,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 本周主要工作内容 + /// 本月主要工作内容 /// private void GetThisWeekOrMonthContentList(string reportId) { @@ -244,7 +253,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 下周质量控制重点 + /// 下月质量控制重点 /// /// private void GetNextQualityControlList(string reportId) @@ -256,9 +265,9 @@ namespace FineUIPro.Web.CQMS.ManageReport } #endregion - #region 本周主要内容 + #region 本月主要内容 /// - /// 增加本周主要内容 + /// 增加本月主要内容 /// /// /// @@ -275,7 +284,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 检查并保存本周主要内容集合 + /// 检查并保存本月主要内容集合 /// private void saveThisWeekAndMonthContent() { @@ -292,7 +301,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 本周主要内容行点击事件 + /// 本月主要内容行点击事件 /// /// /// @@ -385,6 +394,7 @@ namespace FineUIPro.Web.CQMS.ManageReport this.gvRowMaterialProblem.DataBind(); } } + #endregion #region 施工过程问题 @@ -480,10 +490,11 @@ namespace FineUIPro.Web.CQMS.ManageReport #endregion #region 检验批统计 + #region 绑定GridView /// - /// 绑定数据 + /// 绑定 /// - /// + /// public void CheckLotBindStatisc(string cNProfessionalCode) { DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); @@ -514,7 +525,7 @@ namespace FineUIPro.Web.CQMS.ManageReport Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId); if (divisionProject != null) { - Model.WBS_UnitWork ins = BLL.UnitWorkService.getUnitWorkByUnitWorkId(divisionProject.UnitWorkId); + Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(divisionProject.UnitWorkId); if (ins != null) { if (!workNames.Contains(ins.UnitWorkName)) //新增记录 @@ -542,9 +553,9 @@ namespace FineUIPro.Web.CQMS.ManageReport } } } - /*if (cNProfessionalId == BLL.Const.CNProfessionalCVId) //土建按单位工程统计 { + } else { @@ -631,6 +642,34 @@ namespace FineUIPro.Web.CQMS.ManageReport } StatisticsList.Add(StatisticsLast); } + else //新增本周/月无验收数据的也需要列出表格 + { + + Model.CheckStatisc StatisticsLast = new Model.CheckStatisc(); + StatisticsLast.Num = StatisticsList.Count() + 1; + StatisticsLast.WorkName = "合计"; + StatisticsLast.CheckNum = 0; + StatisticsLast.TotalCheckNum = 0; + StatisticsLast.OKNum = 0; + StatisticsLast.TotalOKNum = 0; + if (StatisticsLast.CheckNum != 0)//被除数不能为零 + { + StatisticsLast.OneOKRate = Math.Round((double)StatisticsLast.OKNum / (double)StatisticsLast.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsLast.OneOKRate = "0%"; + } + if (StatisticsLast.TotalCheckNum != 0)//被除数不能为零 + { + StatisticsLast.TotalOneOKRate = Math.Round((double)StatisticsLast.TotalOKNum / (double)StatisticsLast.TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsLast.TotalOneOKRate = "0%"; + } + StatisticsList.Add(StatisticsLast); + } if (cNProfessionalCode == "CV") { @@ -668,6 +707,7 @@ namespace FineUIPro.Web.CQMS.ManageReport this.gvXF.DataBind(); } } + #endregion /// /// GridView创建行时激发 @@ -808,7 +848,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#分包商#探伤部位#RT数量 本周,累计#一次合格 本周,累计#一次合格率 本周,累计"; + string headerStr = "序号#分包商#探伤部位#RT数量 本月,累计#一次合格 本月,累计#一次合格率 本月,累计"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -833,7 +873,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { projectStartDate = project.StartDate.Value; } - //当期集合 + //所有集合 List totalManagementList = BLL.NCRManagementService.GetNCRManagementListByDate(this.CurrUser.LoginProjectId, startDate, endDate); List unitNames = (from x in totalManagementList select x.ReceiveUnit).Distinct().ToList(); foreach (var item in unitNames) @@ -894,7 +934,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#接收单位#本周已完成#累计已完成#NCR总数#累计完成比例"; + string headerStr = "序号#接收单位#本月已完成#累计已完成#NCR总数#累计完成比例"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -975,7 +1015,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#专业#发布数量 本周,累计#业主批准数量 本周,累计#完成情况 本周,累计"; + string headerStr = "序号#专业#发布数量 本月,累计#业主批准数量 本月,累计#完成情况 本月,累计"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -1008,7 +1048,6 @@ namespace FineUIPro.Web.CQMS.ManageReport where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2 orderby y.UnitCode select new { x.UnitId, y.UnitName }; - var db = Funs.DB; foreach (var item in units) { @@ -1091,7 +1130,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#分包商#管道焊工 本周上岗,累计#钢结构焊工 本周上岗,累计#设备焊工 本周上岗,累计#其他 本周上岗,累计"; + string headerStr = "序号#分包商#管道焊工 本月上岗,累计#钢结构焊工 本月上岗,累计#设备焊工 本月上岗,累计#其他 本月上岗,累计"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -1162,9 +1201,9 @@ namespace FineUIPro.Web.CQMS.ManageReport #endregion - #region 下周质量控制重点 + #region 下月质量控制重点 /// - /// 增加下周质量控制重点 + /// 增加下月质量控制重点 /// /// /// @@ -1233,20 +1272,26 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) { - CheckLotBindStatisc("CV");//检验批统计:土建 - CheckLotBindStatisc("EQ");//检验批统计:设备 - CheckLotBindStatisc("PP");//检验批统计:管道 - CheckLotBindStatisc("EL");//检验批统计:电气 - CheckLotBindStatisc("IN");//检验批统计:仪表 - CheckLotBindStatisc("FF");//检验批统计:反腐 - CheckLotBindStatisc("XF");//检验批统计:消防 - GetComprehensive();//综合管理 - BindStatisc();//无损检测统计 - NCRBindStatisc();//NCR统计 - DesignChangeOrderBindStatisc();//设计变更统计 - PassWelderBindStatisc();//合格焊工统计 - ConstructionStatisticsr();//施工方案统计 - + //CheckLotBindStatisc("CV");//检验批统计:土建 + //CheckLotBindStatisc("EQ");//检验批统计:设备 + //CheckLotBindStatisc("PP");//检验批统计:管道 + //CheckLotBindStatisc("EL");//检验批统计:电气 + //CheckLotBindStatisc("IN");//检验批统计:仪表 + //CheckLotBindStatisc("FF");//检验批统计:反腐 + //CheckLotBindStatisc("XF");//检验批统计:消防 + //GetComprehensive();//综合管理 + //BindStatisc();//无损检测统计 + //NCRBindStatisc();//NCR统计 + //DesignChangeOrderBindStatisc();//设计变更统计 + //PassWelderBindStatisc();//合格焊工统计 + //ConstructionStatisticsr();//施工方案统计 + //Response.AddHeader("Refresh", "0"); + string url = Request.Url.ToString(); + if (url.Contains("?")) + { + url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?')); + } + Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text); } } #endregion @@ -1272,7 +1317,6 @@ namespace FineUIPro.Web.CQMS.ManageReport ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true); return; } - } if (!string.IsNullOrEmpty(this.txtStartDate.Text)) { @@ -1282,7 +1326,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { report.EndDate = Convert.ToDateTime(this.txtEndDate.Text); } - report.ReportType = "1"; + report.ReportType = "2"; BLL.ThisWeekOrMonthContentService.DeleteThisWeekOrMonthContentByReportId(this.ReportId); BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(this.ReportId); @@ -1300,7 +1344,7 @@ namespace FineUIPro.Web.CQMS.ManageReport report.ReportId = this.ReportId; BLL.WeekAndMonthReportService.AddWeekAndMonthReport(report); } - //本周主要工作内容 + //本月主要工作内容 saveThisWeekAndMonthContent(); foreach (var item in thisWeekOrMonthContentLists) { @@ -1336,7 +1380,7 @@ namespace FineUIPro.Web.CQMS.ManageReport comprehensive.Others = this.txt9.Text.Trim(); BLL.ComprehensiveService.AddComprehensive(comprehensive); - //下周质量控制重点 + //下月质量控制重点 saveNextQualityControl(); foreach (var item in nextQualityControlLists) { @@ -1369,5 +1413,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } #endregion + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx index a80991ef..be853495 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocManageEdit.aspx.cs" Inherits="FineUIPro.Web.DocManage.DocManageEdit" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocManageEdit.aspx.cs" Inherits="FineUIPro.Web.DocManage.DocManageEdit" ValidateRequest="false" %> @@ -155,7 +155,7 @@ - @@ -179,16 +179,22 @@ - - - + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs index 2ee53dde..c55ac094 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs @@ -524,7 +524,7 @@ namespace FineUIPro.Web.DocManage approve1.ApproveMan = CurrUser.UserId; DocManageApproveService.AddDocManageApprove(approve1); } - //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); LogService.AddSys_Log(CurrUser, doc.DocCode, DocId, Const.DocManageMenuId, "编辑文档"); }