diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 57bc266c..7c0306ba 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -2966,7 +2966,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 保存本月质量目标管理情况 void saveTarget() { - CqmsTargetService.Delete(ReportId);//本月质量目标管理情况 + CqmsTargetService.Delete(ReportId);//本月质量目标管理情况 List detailLists = new List(); JArray teamGroupData = Grid1.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -2991,11 +2991,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew detailLists.Add(newDetail); } if (detailLists.Count > 0) - { + { db.Report_CqmsTarget.InsertAllOnSubmit(detailLists); db.SubmitChanges(); } - } #endregion @@ -3422,7 +3421,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveGDInspection() //检验批统计:管道 { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3"); List detailLists = new List(); JArray teamGroupData = GvGD.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3457,7 +3456,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew void saveDQInspection() //检验批统计:电气 { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4"); List detailLists = new List(); JArray teamGroupData = GvDq.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3493,7 +3492,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveYBInspection() //检验批统计:仪表 { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5"); List detailLists = new List(); JArray teamGroupData = GvYb.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3529,7 +3528,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveFFInspection() //检验批统计:防腐 { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6"); List detailLists = new List(); JArray teamGroupData = GvFf.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3565,7 +3564,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveXFInspection() //检验批统计:消防 { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7"); List detailLists = new List(); JArray teamGroupData = GvXf.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3601,7 +3600,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveInspectionDataInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10"); List detailLists = new List(); JArray teamGroupData = gvInspectionDataInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3643,7 +3642,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 11.压力管道监检情况 void savePressureInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11"); List detailLists = new List(); JArray teamGroupData = gvPressureInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3680,7 +3679,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 12.管道试压包管理情况 void savePipingInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12"); List detailLists = new List(); JArray teamGroupData = gvPipingInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3717,7 +3716,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 13.特种设备监检情况 void saveSpecialInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13"); List detailLists = new List(); JArray teamGroupData = gvSpecialInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3754,7 +3753,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 14.NCR管理情况 void saveNcrManagementInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14"); List detailLists = new List(); JArray teamGroupData = gvNcrManagementInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3793,7 +3792,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveQualityInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1"); List detailLists = new List(); JArray teamGroupData = gvQualityInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3831,7 +3830,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSpecialCheck() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"2"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "2"); List detailLists = new List(); JArray teamGroupData = gvSpecialCheck.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3868,7 +3867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveFileReport() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"3"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "3"); List detailLists = new List(); JArray teamGroupData = gvFileReport.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3906,7 +3905,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveRowMaterialProblem() { - BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); + BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3915,7 +3914,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem { - RowMaterialProblemId = values.Value("Id"), + RowMaterialProblemId = values.Value("RowMaterialProblemId"), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3941,7 +3940,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveConstructionProblems() { - BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); + BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvConstructionProblems.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3950,7 +3949,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems { - ConstructionProblemsId = values.Value("Id"), + ConstructionProblemsId = values.Value("ConstructionProblemsId"), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3988,7 +3987,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl { - NextQualityControlId = values.Value("Id"), + NextQualityControlId = values.Value("NextQualityControlId"), ReportId = ReportId, NextQualityControlContent = values.Value("NextQualityControlContent") }; @@ -4067,7 +4066,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew protected void Text_TextChanged(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); } protected override object LoadPageStateFromPersistenceMedium() diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index eec0ea33..a607d02b 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -221,7 +221,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) { txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText; txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText; @@ -525,7 +525,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 unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); + var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); foreach (var item in unitLists) { @@ -1148,7 +1148,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew // where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2) // orderby y.UnitCode // select new { x.UnitId, y.UnitName }; - var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList(); + var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList(); int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计 @@ -2931,14 +2931,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew db.Report_CqmsTarget.InsertAllOnSubmit(detailLists); db.SubmitChanges(); } - } #endregion #region 保存PQR/WPS报验情况 void savePqrWps() { - BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId,"5"); + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "5"); List detailLists = new List(); JArray teamGroupData = Grid9.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3255,7 +3254,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 9.计量器具报验管理情况 void saveMeasuringInspection() { - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"9"); + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9"); List detailLists = new List(); JArray teamGroupData = gvMeasuringInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -4010,7 +4009,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew protected void Text_TextChanged(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); } protected override object LoadPageStateFromPersistenceMedium() diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 67492eac..58dd68d6 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 57d9bc2c..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 @@ -9,7 +9,7 @@ - E:\诺必达\五环\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml + G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml MvcControllerEmptyScaffolder root/Common/MVC/Controller 600