diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 2b098ccf..c621ab08 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -66,7 +66,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 加载所有单位 [Serializable] - public class UnitClass { + public class UnitClass + { public string UnitId { get; set; } public string UnitName { get; set; } @@ -90,7 +91,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 加载所有专业 [Serializable] - public class ProfessionalsClass { + public class ProfessionalsClass + { public string CNProfessionalId { get; set; } public string ProfessionalName { get; set; } } @@ -121,20 +123,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { //加载所有单位 units = (from x in db.Project_ProjectUnit - join y in db.Base_Unit on x.UnitId equals y.UnitId - where x.ProjectId == this.CurrUser.LoginProjectId - orderby y.UnitCode - select new UnitClass{ UnitId=x.UnitId, UnitName=y.UnitName, UnitType=x.UnitType }).ToList(); + join y in db.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId + orderby y.UnitCode + select new UnitClass { UnitId = x.UnitId, UnitName = y.UnitName, UnitType = x.UnitType }).ToList(); //加载所有专业 CNProfessionals = (from x in db.Base_CNProfessional - where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId - && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId + where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId + && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex - select new ProfessionalsClass - { - CNProfessionalId=x.CNProfessionalId, - ProfessionalName=x.ProfessionalName - }).ToList(); + select new ProfessionalsClass + { + CNProfessionalId = x.CNProfessionalId, + ProfessionalName = x.ProfessionalName + }).ToList(); BLL.UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); BLL.UnitService.InitUnitDownListByText(this.drpUnitIdGrid9, this.CurrUser.LoginProjectId, true); @@ -244,7 +246,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 加载文本框内容 var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList(); - if (txtReportList.Count>0) + if (txtReportList.Count > 0) { if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null) { @@ -422,7 +424,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } } - protected void btnLoad_Click(object sender, EventArgs e) { + protected void btnLoad_Click(object sender, EventArgs e) + { if (AddOrUpdate == "update") { lodAllGrid("1"); @@ -439,7 +442,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 本月质量目标管理情况 Grid1方法 protected void btnAddGrid1_Click(object sender, EventArgs e) - { + { Grid1.Hidden = false; JArray teamGroupData = Grid1.GetMergedData(); @@ -1076,7 +1079,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 7.2 PQR/WPS报验情况 Grid9方法 protected void btnAddGrid9_Click(object sender, EventArgs e) - { + { Grid9.Hidden = false; JArray teamGroupData = Grid9.GetMergedData(); @@ -1126,7 +1129,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { DataTable source = ObjectToTable(Grid9.DataSource); int Quantity1Total = 0, Quantity2Total = 0; - if (source!=null) + if (source != null) { foreach (DataRow row in source.Rows) { @@ -1140,7 +1143,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew summary.Add("Quantity2", Quantity2Total.ToString()); Grid9.SummaryData = summary; } - + } public static DataTable ObjectToTable(object obj) @@ -1255,7 +1258,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew c.MonthRate, c.TotalRate }; - if (query.ToList().Count > 0) { + if (query.ToList().Count > 0) + { //加载工艺管道 var gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "工艺管道"); var model = new Model.ProcessControl_NondestructiveTest_New(); @@ -1378,7 +1382,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Grid10.Hidden = true; hidWsjcgl.Hidden = false; } - else { + else + { Grid10.Hidden = false; hidWsjcgl.Hidden = true; Grid10.DataSource = list; @@ -1426,7 +1431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId - //&& c.Status == "3" + //&& c.Status == "3" select new @@ -1738,7 +1743,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } //int i = 1; string cNProfessionalId = (from x in db.Base_CNProfessional where x.CNProfessionalCode == cNProfessionalCode select x.CNProfessionalId).FirstOrDefault(); - + List workNames = new List(); //专业下所有集合 List totalManagementList = BLL.InspectionManagementService.getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false); @@ -2121,7 +2126,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew // where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) // orderby y.UnitCode // select new { x.UnitId, y.UnitName }; - var specialUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); + var specialUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); foreach (var item in specialUnits) { var query = from c in db.Comprehensive_SpecialEquipment @@ -2233,8 +2238,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew NCRStatisc.WorkName = item.UnitName; //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); - NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); - NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); + //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); + //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); + NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count(); + NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count(); NCRStatisc.CheckNum = AllList.Count(); @@ -2840,7 +2847,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ShowNotify("设计质量情况字符长度不能大于2000!", MessageBoxIcon.Warning); return; } - if (this.txtAre1.Text.Length>2000) + if (this.txtAre1.Text.Length > 2000) { ShowNotify("采购质量情况字符长度不能大于2000!", MessageBoxIcon.Warning); return; @@ -2855,7 +2862,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ShowNotify("项目质量体系审核字符长度不能大于2000!", MessageBoxIcon.Warning); return; } - if (this.txtAre21.Text.Length>2000) + if (this.txtAre21.Text.Length > 2000) { ShowNotify("类似项目管理经验教训应对措施及跟踪字符长度不能大于2000!", MessageBoxIcon.Warning); return; @@ -3603,7 +3610,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { //Id = values.Value("Id"), - Id= SQLHelper.GetNewID(), + Id = SQLHelper.GetNewID(), ReportId = ReportId, ReType = "9", ContentName = values.Value("ContentName"), @@ -3962,7 +3969,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 TotationRate = values.Value("TotalOneOKRate"), Remarks = values.Value("Remarks"),//本月累计合格点数 - + }; ////if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0) ////{ @@ -4157,7 +4164,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew catch (Exception) { return; - } + } } } #endregion @@ -4203,7 +4210,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew catch (Exception) { return; - } + } } } #endregion @@ -4248,7 +4255,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew catch (Exception) { return; - } + } } } #endregion @@ -4294,7 +4301,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew catch (Exception) { return; - } + } } } #endregion @@ -4358,7 +4365,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems { //ConstructionProblemsId = values.Value("ConstructionProblemsId"), - ConstructionProblemsId= SQLHelper.GetNewID(), + ConstructionProblemsId = SQLHelper.GetNewID(), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -4404,7 +4411,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl { //NextQualityControlId = values.Value("NextQualityControlId"), - NextQualityControlId= SQLHelper.GetNewID(), + NextQualityControlId = SQLHelper.GetNewID(), ReportId = ReportId, NextQualityControlContent = values.Value("NextQualityControlContent") }; @@ -4439,7 +4446,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew imgage1.ReportId = ReportId; imgage1.ContentType = "23-1"; imgage1.ContentText = txtPhotoContent1.Text; - imgage1.ImageUrl = imgPhoto.ImageUrl.Substring(imgPhoto.ImageUrl.IndexOf("/")+1); + imgage1.ImageUrl = imgPhoto.ImageUrl.Substring(imgPhoto.ImageUrl.IndexOf("/") + 1); ImageLists.Add(imgage1); var imgage2 = new Model.Report_TextBoxContent(); diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 41e155dd..5412083c 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>G:\发布\五环WebApi - True|2025-07-21T09:46:45.4620710Z||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; + True|2025-07-23T02:36:09.9990536Z||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 07/21/2025 17:46:44 + 07/23/2025 10:36:08 - 07/21/2025 17:46:44 + 07/23/2025 10:36:08 12/06/2024 20:13:58 - 07/21/2025 17:46:34 + 07/23/2025 10:35:29 12/26/2024 09:46:52 - 07/21/2025 17:46:34 + 07/23/2025 10:35:29 12/18/2020 05:32:28 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 07/21/2025 17:46:36 + 07/23/2025 10:35:59 - 07/21/2025 17:46:36 + 07/23/2025 10:35:59 - 07/21/2025 17:46:35 + 07/23/2025 10:35:59 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 07/21/2025 17:46:36 + 07/23/2025 10:36:00 10/28/2024 14:02:50