From 85bd05b848947ac0e750e2102174f2031e2da870 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 24 Jan 2025 14:29:31 +0800 Subject: [PATCH] =?UTF-8?q?20250125=20=E8=B4=A8=E9=87=8F=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportNew/ConstructionPlanService.cs | 4 +- .../Report_CQMS_MonthReportItemService.cs | 12 +- .../CQMS/ManageReportNew/MonthReport.aspx.cs | 2 +- .../CQMS/ManageReportNew/MonthReportEdit.aspx | 105 +++++++++++--- .../ManageReportNew/MonthReportEdit.aspx.cs | 130 +++++++++++------- .../MonthReportNewEdit.aspx.cs | 2 +- .../MonthReportNewEdit2.aspx.cs | 4 +- .../CQMS/ManageReportNew/WeekReport.aspx.cs | 2 +- .../CQMS/ManageReportNew/WeekReportEdit.aspx | 86 ++++++++++-- .../ManageReportNew/WeekReportEdit.aspx.cs | 117 ++++++++++------ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- 11 files changed, 331 insertions(+), 135 deletions(-) diff --git a/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs b/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs index 48a573b3..dea7b26a 100644 --- a/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs @@ -64,11 +64,11 @@ namespace BLL.CQMS.ManageReport.ReportNew } } - public static bool Delete(string newId) + public static bool Delete(string newId, string reType) { try { - var result = Funs.DB.Report_Construction_Plan.Where(a => a.ReportId == newId).ToList(); + var result = Funs.DB.Report_Construction_Plan.Where(a => a.ReportId == newId && a.ReType == reType).ToList(); if (result.Count > 0) { Funs.DB.Report_Construction_Plan.DeleteAllOnSubmit(result); diff --git a/SGGL/BLL/CQMS/ManageReport/ReportNew/Report_CQMS_MonthReportItemService.cs b/SGGL/BLL/CQMS/ManageReport/ReportNew/Report_CQMS_MonthReportItemService.cs index 1c8c0745..6488f9c1 100644 --- a/SGGL/BLL/CQMS/ManageReport/ReportNew/Report_CQMS_MonthReportItemService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ReportNew/Report_CQMS_MonthReportItemService.cs @@ -39,7 +39,17 @@ namespace BLL /// 根据月报id删除相关明细信息 /// /// - public static void DeleteReportItemByReportId(string reportId) + public static void DeleteReportItemByReportId(string reportId,string reType) + { + var q = (from x in Funs.DB.Report_CQMS_MonthReportItem where x.ReportId == reportId && x.ReType==reType select x).ToList(); + if (q.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + + public static void DeleteReportItem(string reportId) { var q = (from x in Funs.DB.Report_CQMS_MonthReportItem where x.ReportId == reportId select x).ToList(); if (q.Count > 0) diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs index 0852a2df..d2d91704 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs @@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //本月质量目标管理情况 CqmsTargetService.Delete(rowID); TextBoxContentService.Delete(rowID); - Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(rowID); + Report_CQMS_MonthReportItemService.DeleteReportItem(rowID); WeekAndMonthReportNewService.Delete(rowID); } BindGrid(); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index c456400d..93599a90 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -180,7 +180,6 @@ - @@ -188,7 +187,6 @@ - @@ -196,7 +194,6 @@ - @@ -204,7 +201,6 @@ - @@ -212,7 +208,6 @@ - @@ -220,8 +215,9 @@ - - + @@ -334,7 +330,10 @@ - + + @@ -386,10 +385,10 @@ - - - - + + @@ -436,7 +435,10 @@ - + + @@ -489,7 +491,10 @@ - + + @@ -539,7 +544,10 @@ - + + @@ -594,7 +602,6 @@ - @@ -725,6 +732,9 @@ + @@ -779,6 +789,9 @@ + @@ -840,9 +853,9 @@ - - - + @@ -900,6 +913,9 @@ + @@ -962,6 +978,9 @@ + @@ -1016,6 +1035,9 @@ + @@ -1070,6 +1092,9 @@ + @@ -1124,6 +1149,9 @@ + @@ -1178,6 +1206,9 @@ + @@ -1232,6 +1263,9 @@ + @@ -1286,6 +1320,9 @@ + @@ -1330,6 +1367,9 @@ + @@ -1372,6 +1412,9 @@ + @@ -1418,6 +1461,9 @@ + @@ -1461,6 +1507,9 @@ + @@ -1499,6 +1548,9 @@ + @@ -1550,6 +1602,9 @@ + @@ -1594,6 +1649,9 @@ + @@ -1633,6 +1691,9 @@ + @@ -1712,7 +1773,7 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ReportId" Hidden="true"> @@ -1784,7 +1845,7 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ReportId" Hidden="true"> @@ -1833,7 +1894,7 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ReportId" Hidden="true"> diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index a7c228ed..57bc266c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -439,9 +439,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 本月质量目标管理情况 Grid1方法 protected void btnAddGrid1_Click(object sender, EventArgs e) - { - SaveMethod(); - + { Grid1.Hidden = false; JArray teamGroupData = Grid1.GetMergedData(); @@ -449,7 +447,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -466,6 +464,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew list.Add(defaultObj); Grid1.DataSource = list; Grid1.DataBind(); + + //SaveMethod(); } protected void Grid1_PreDataBound(object sender, EventArgs e) @@ -1076,8 +1076,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 7.2 PQR/WPS报验情况 Grid9方法 protected void btnAddGrid9_Click(object sender, EventArgs e) - { - SaveMethod(); + { Grid9.Hidden = false; JArray teamGroupData = Grid9.GetMergedData(); @@ -1085,7 +1084,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -1101,6 +1100,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew list.Add(defaultObj); Grid9.DataSource = list; Grid9.DataBind(); + + //SaveMethod(); } protected void Grid9_PreDataBound(object sender, EventArgs e) @@ -2527,7 +2528,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnRowMaterialProblem_Click(object sender, EventArgs e) { - SaveMethod(); gvRowMaterialProblem.Hidden = false; JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); @@ -2535,7 +2535,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2551,6 +2551,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew list.Add(defaultObj); gvRowMaterialProblem.DataSource = list; gvRowMaterialProblem.DataBind(); + + //SaveMethod(); } /// @@ -2582,7 +2584,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddConstructionProblems_Click(object sender, EventArgs e) { - SaveMethod(); gvConstructionProblems.Hidden = false; JArray teamGroupData = gvConstructionProblems.GetMergedData(); @@ -2590,7 +2591,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2606,6 +2607,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew list.Add(defaultObj); gvConstructionProblems.DataSource = list; gvConstructionProblems.DataBind(); + + //SaveMethod(); } /// @@ -2651,7 +2654,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddNextControl_Click(object sender, EventArgs e) { - SaveMethod(); gvNextQualityControl.Hidden = false; JArray teamGroupData = gvNextQualityControl.GetMergedData(); @@ -2659,7 +2661,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2671,6 +2673,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew list.Add(defaultObj); gvNextQualityControl.DataSource = list; gvNextQualityControl.DataBind(); + + //SaveMethod(); } /// @@ -2686,7 +2690,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 23.施工照片 protected void filePhoto_FileSelected(object sender, EventArgs e) { - SaveMethod(); if (filePhoto.HasFile) { string fileName = filePhoto.ShortFileName; @@ -2812,6 +2815,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew // 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！） filePhoto6.Reset(); } + + SaveMethod(); } #endregion @@ -2865,22 +2870,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 删除所有子表 //本月质量目标管理情况 - CqmsTargetService.Delete(ReportId); + //CqmsTargetService.Delete(ReportId); //所有文本框表 TextBoxContentService.Delete(ReportId); //删除施工方案及检验试验计划审批情况 - BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); + //BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); // 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况 - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); + //BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); //18.本月质量问题处理情况(1)原材料问题 - BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); + //BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); //18.本月质量问题处理情况(2)施工过程问题 - BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); + //BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); //19.下月质量控制重点 - BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); + //BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); #endregion @@ -2961,6 +2966,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 保存本月质量目标管理情况 void saveTarget() { + CqmsTargetService.Delete(ReportId);//本月质量目标管理情况 List detailLists = new List(); JArray teamGroupData = Grid1.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -2969,7 +2975,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget { - Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)), + Id = values.Value("Id"), ReportId = ReportId, ProStage = values.Value("ProStage"), ProDescribe = values.Value("ProDescribe"), @@ -2985,7 +2991,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew detailLists.Add(newDetail); } if (detailLists.Count > 0) - { + { db.Report_CqmsTarget.InsertAllOnSubmit(detailLists); db.SubmitChanges(); } @@ -2996,6 +3002,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 保存PQR/WPS报验情况 void savePqrWps() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "5"); List detailLists = new List(); JArray teamGroupData = Grid9.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3004,7 +3011,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "5", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3032,6 +3039,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveYbsgfa() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0"); List detailLists = new List(); JArray teamGroupData = Grid2.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3040,7 +3048,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "0", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3066,6 +3074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveWdgcfa() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1"); List detailLists = new List(); JArray teamGroupData = Grid3.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3074,7 +3083,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "1", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3101,6 +3110,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveJysyjh() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2"); List detailLists = new List(); JArray teamGroupData = Grid4.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3109,7 +3119,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "2", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3137,6 +3147,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSjjd() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3"); List detailLists = new List(); JArray teamGroupData = Grid5.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3145,7 +3156,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "3", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3173,6 +3184,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveTzhs() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4"); List detailLists = new List(); JArray teamGroupData = Grid6.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3181,7 +3193,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "4", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3209,6 +3221,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSbclBy() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6"); List detailLists = new List(); JArray teamGroupData = Grid11.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3217,7 +3230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "6", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3306,7 +3319,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 9.计量器具报验管理情况 void saveMeasuringInspection() { - + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9"); List detailLists = new List(); JArray teamGroupData = gvMeasuringInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3315,7 +3328,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "9", ContentName = values.Value("ContentName"), @@ -3341,6 +3354,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 10.现场质量共检数据 void saveTjInspection() //检验批统计:土建 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1"); List detailLists = new List(); JArray teamGroupData = gvTj.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3349,7 +3363,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-1", ContentName = values.Value("WorkName"), @@ -3374,6 +3388,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveSbInspection() //检验批统计:设备 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2"); List detailLists = new List(); JArray teamGroupData = GvSb.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3382,7 +3397,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-2", ContentName = values.Value("WorkName"), @@ -3407,6 +3422,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveGDInspection() //检验批统计:管道 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3"); List detailLists = new List(); JArray teamGroupData = GvGD.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3415,7 +3431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-3", ContentName = values.Value("WorkName"), @@ -3441,6 +3457,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew void saveDQInspection() //检验批统计:电气 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4"); List detailLists = new List(); JArray teamGroupData = GvDq.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3449,7 +3466,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-4", ContentName = values.Value("WorkName"), @@ -3476,6 +3493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveYBInspection() //检验批统计:仪表 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5"); List detailLists = new List(); JArray teamGroupData = GvYb.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3484,7 +3502,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-5", ContentName = values.Value("WorkName"), @@ -3511,6 +3529,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveFFInspection() //检验批统计:防腐 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6"); List detailLists = new List(); JArray teamGroupData = GvFf.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3519,7 +3538,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-6", ContentName = values.Value("WorkName"), @@ -3546,6 +3565,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveXFInspection() //检验批统计:消防 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7"); List detailLists = new List(); JArray teamGroupData = GvXf.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3554,7 +3574,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-7", ContentName = values.Value("WorkName"), @@ -3581,6 +3601,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveInspectionDataInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10"); List detailLists = new List(); JArray teamGroupData = gvInspectionDataInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3589,7 +3610,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10", ContentName = values.Value("WorkName"), @@ -3622,6 +3643,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 11.压力管道监检情况 void savePressureInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11"); List detailLists = new List(); JArray teamGroupData = gvPressureInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3630,7 +3652,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "11", TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), @@ -3658,6 +3680,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 12.管道试压包管理情况 void savePipingInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12"); List detailLists = new List(); JArray teamGroupData = gvPipingInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3666,7 +3689,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "12", TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), @@ -3694,6 +3717,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 13.特种设备监检情况 void saveSpecialInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13"); List detailLists = new List(); JArray teamGroupData = gvSpecialInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3702,7 +3726,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "13", TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), @@ -3730,6 +3754,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 14.NCR管理情况 void saveNcrManagementInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14"); List detailLists = new List(); JArray teamGroupData = gvNcrManagementInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3738,7 +3763,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "14", ContentName = values.Value("WorkName"), @@ -3755,6 +3780,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } if (detailLists.Count > 0) { + db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); db.SubmitChanges(); } @@ -3767,6 +3793,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveQualityInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1"); List detailLists = new List(); JArray teamGroupData = gvQualityInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3775,7 +3802,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "1", ContentName = values.Value("ContentName"), @@ -3804,6 +3831,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSpecialCheck() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"2"); List detailLists = new List(); JArray teamGroupData = gvSpecialCheck.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3812,7 +3840,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "2", ContentName = values.Value("ContentName"), @@ -3840,6 +3868,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveFileReport() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"3"); List detailLists = new List(); JArray teamGroupData = gvFileReport.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3848,7 +3877,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "3", ContentName = values.Value("ContentName"), @@ -3877,6 +3906,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveRowMaterialProblem() { + BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3885,7 +3915,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem { - RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)), + RowMaterialProblemId = values.Value("Id"), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3911,6 +3941,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveConstructionProblems() { + BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvConstructionProblems.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3919,7 +3950,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems { - ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)), + ConstructionProblemsId = values.Value("Id"), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3948,6 +3979,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveNextQualityControl() { + BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvNextQualityControl.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3956,7 +3988,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl { - NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)), + NextQualityControlId = values.Value("Id"), ReportId = ReportId, NextQualityControlContent = values.Value("NextQualityControlContent") }; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs index b57f6565..d09f5e16 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs @@ -291,7 +291,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew TextBoxContentService.Delete(ReportId); // 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况 - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); + //BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); //18.本月质量问题处理情况(1)原材料问题 BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); //18.本月质量问题处理情况(2)施工过程问题 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs index 4cc8b3be..6c384c99 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs @@ -2536,10 +2536,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew TextBoxContentService.Delete(ReportId); //删除施工方案及检验试验计划审批情况 - BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); + //BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); // 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况 - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); + //BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); //18.本月质量问题处理情况(1)原材料问题 BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); //18.本月质量问题处理情况(2)施工过程问题 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs index 01595a21..51393c7d 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs @@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //本周质量目标管理情况 CqmsTargetService.Delete(rowID); TextBoxContentService.Delete(rowID); - Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(rowID); + Report_CQMS_MonthReportItemService.DeleteReportItem(rowID); WeekAndMonthReportNewService.Delete(rowID); } BindGrid(); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx index 99f997da..039550cf 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx @@ -220,7 +220,9 @@ - + @@ -334,7 +336,9 @@ - + @@ -386,7 +390,9 @@ - + @@ -435,7 +441,9 @@ - + @@ -489,7 +497,9 @@ - + @@ -539,7 +549,9 @@ - + @@ -723,7 +735,9 @@ - + @@ -777,7 +791,10 @@ - + + @@ -840,7 +857,9 @@ - + @@ -898,6 +917,9 @@ + + @@ -960,7 +982,9 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计"> - + @@ -1015,6 +1039,9 @@ + @@ -1069,6 +1096,9 @@ + @@ -1123,6 +1153,9 @@ + @@ -1177,6 +1210,9 @@ + @@ -1231,6 +1267,9 @@ + @@ -1285,6 +1324,9 @@ + @@ -1329,6 +1371,9 @@ + @@ -1371,6 +1416,9 @@ + @@ -1418,6 +1466,9 @@ + @@ -1461,6 +1512,9 @@ + @@ -1499,6 +1553,9 @@ + @@ -1550,6 +1607,9 @@ + @@ -1595,6 +1655,9 @@ + @@ -1634,6 +1697,9 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index 7546a212..eec0ea33 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -381,7 +381,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 本月质量目标管理情况 Grid1方法 protected void btnAddGrid1_Click(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); Grid1.Hidden = false; JArray teamGroupData = Grid1.GetMergedData(); @@ -389,7 +389,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -1007,7 +1007,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 7.2 PQR/WPS报验情况 Grid9方法 protected void btnAddGrid9_Click(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); Grid9.Hidden = false; JArray teamGroupData = Grid9.GetMergedData(); @@ -1015,7 +1015,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2462,7 +2462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnRowMaterialProblem_Click(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); gvRowMaterialProblem.Hidden = false; JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); @@ -2470,7 +2470,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2517,7 +2517,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddConstructionProblems_Click(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); gvConstructionProblems.Hidden = false; JArray teamGroupData = gvConstructionProblems.GetMergedData(); @@ -2525,7 +2525,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2586,7 +2586,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddNextControl_Click(object sender, EventArgs e) { - SaveMethod(); + //SaveMethod(); gvNextQualityControl.Hidden = false; JArray teamGroupData = gvNextQualityControl.GetMergedData(); @@ -2594,7 +2594,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew foreach (JObject teamGroupRow in teamGroupData) { JObject values = teamGroupRow.Value("values"); - values.Add("Id", teamGroupRow.Value("id")); + //values.Add("Id", teamGroupRow.Value("id")); list.Add(values); } JObject defaultObj = new JObject @@ -2621,7 +2621,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 23.施工照片 protected void filePhoto_FileSelected(object sender, EventArgs e) { - SaveMethod(); if (filePhoto.HasFile) { string fileName = filePhoto.ShortFileName; @@ -2747,6 +2746,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew // 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！） filePhoto6.Reset(); } + + SaveMethod(); } #endregion @@ -2803,22 +2804,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 删除所有子表 //本月质量目标管理情况 - CqmsTargetService.Delete(ReportId); + //CqmsTargetService.Delete(ReportId); //所有文本框表 TextBoxContentService.Delete(ReportId); //删除施工方案及检验试验计划审批情况 - BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); + //BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId); // 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况 - BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); + //BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId); //18.本月质量问题处理情况(1)原材料问题 - BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); + //BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); //18.本月质量问题处理情况(2)施工过程问题 - BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); + //BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); //19.下月质量控制重点 - BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); + //BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); #endregion @@ -2901,6 +2902,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 保存本月质量目标管理情况 void saveTarget() { + CqmsTargetService.Delete(ReportId); List detailLists = new List(); JArray teamGroupData = Grid1.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -2909,7 +2911,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget { - Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)), + Id = values.Value("Id"), ReportId = ReportId, ProStage = values.Value("ProStage"), ProDescribe = values.Value("ProDescribe"), @@ -2936,6 +2938,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 保存PQR/WPS报验情况 void savePqrWps() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId,"5"); List detailLists = new List(); JArray teamGroupData = Grid9.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -2944,7 +2947,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "5", UnitOrMajor = values.Value("UnitOrMajor"), @@ -2972,6 +2975,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveYbsgfa() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0"); List detailLists = new List(); JArray teamGroupData = Grid2.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -2980,7 +2984,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "0", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3006,6 +3010,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveWdgcfa() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1"); List detailLists = new List(); JArray teamGroupData = Grid3.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3014,7 +3019,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "1", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3041,6 +3046,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveJysyjh() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2"); List detailLists = new List(); JArray teamGroupData = Grid4.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3049,7 +3055,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "2", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3077,6 +3083,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSjjd() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3"); List detailLists = new List(); JArray teamGroupData = Grid5.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3085,7 +3092,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "3", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3113,6 +3120,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveTzhs() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4"); List detailLists = new List(); JArray teamGroupData = Grid6.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3121,7 +3129,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "4", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3149,6 +3157,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSbclBy() { + BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6"); List detailLists = new List(); JArray teamGroupData = Grid11.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3157,7 +3166,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "6", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3246,7 +3255,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 9.计量器具报验管理情况 void saveMeasuringInspection() { - + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"9"); List detailLists = new List(); JArray teamGroupData = gvMeasuringInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3255,7 +3264,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "9", ContentName = values.Value("ContentName"), @@ -3281,6 +3290,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 10.现场质量共检数据 void saveTjInspection() //检验批统计:土建 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1"); List detailLists = new List(); JArray teamGroupData = gvTj.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3289,7 +3299,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-1", ContentName = values.Value("WorkName"), @@ -3317,6 +3327,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveSbInspection() //检验批统计:设备 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2"); List detailLists = new List(); JArray teamGroupData = GvSb.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3325,7 +3336,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-2", ContentName = values.Value("WorkName"), @@ -3352,6 +3363,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveGDInspection() //检验批统计:管道 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3"); List detailLists = new List(); JArray teamGroupData = GvGD.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3360,7 +3372,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-3", ContentName = values.Value("WorkName"), @@ -3388,6 +3400,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew void saveDQInspection() //检验批统计:电气 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4"); List detailLists = new List(); JArray teamGroupData = GvDq.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3396,7 +3409,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-4", ContentName = values.Value("WorkName"), @@ -3423,6 +3436,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveYBInspection() //检验批统计:仪表 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5"); List detailLists = new List(); JArray teamGroupData = GvYb.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3431,7 +3445,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-5", ContentName = values.Value("WorkName"), @@ -3458,6 +3472,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveFFInspection() //检验批统计:防腐 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6"); List detailLists = new List(); JArray teamGroupData = GvFf.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3466,7 +3481,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-6", ContentName = values.Value("WorkName"), @@ -3493,6 +3508,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveXFInspection() //检验批统计:消防 { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7"); List detailLists = new List(); JArray teamGroupData = GvXf.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3501,7 +3517,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10-7", ContentName = values.Value("WorkName"), @@ -3528,6 +3544,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } void saveInspectionDataInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10"); List detailLists = new List(); JArray teamGroupData = gvInspectionDataInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3536,7 +3553,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "10", ContentName = values.Value("WorkName"), @@ -3569,6 +3586,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 11.压力管道监检情况 void savePressureInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11"); List detailLists = new List(); JArray teamGroupData = gvPressureInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3577,7 +3595,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "11", TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), @@ -3605,6 +3623,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 12.管道试压包管理情况 void savePipingInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12"); List detailLists = new List(); JArray teamGroupData = gvPipingInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3613,7 +3632,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "12", TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), @@ -3641,6 +3660,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 13.特种设备监检情况 void saveSpecialInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13"); List detailLists = new List(); JArray teamGroupData = gvSpecialInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3649,7 +3669,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "13", TotalNoBackCount = Funs.GetNewIntOrZero(values.Value("TotalNoBackCount")), @@ -3677,6 +3697,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 14.NCR管理情况 void saveNcrManagementInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14"); List detailLists = new List(); JArray teamGroupData = gvNcrManagementInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3685,7 +3706,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "14", ContentName = values.Value("WorkName"), @@ -3714,6 +3735,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveQualityInspection() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1"); List detailLists = new List(); JArray teamGroupData = gvQualityInspection.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3722,7 +3744,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "1", ContentName = values.Value("ContentName"), @@ -3751,6 +3773,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveSpecialCheck() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "2"); List detailLists = new List(); JArray teamGroupData = gvSpecialCheck.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3759,7 +3782,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "2", ContentName = values.Value("ContentName"), @@ -3787,6 +3810,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveFileReport() { + BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "3"); List detailLists = new List(); JArray teamGroupData = gvFileReport.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3795,7 +3819,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem { - Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)), + Id = values.Value("Id"), ReportId = ReportId, ReType = "3", ContentName = values.Value("ContentName"), @@ -3824,6 +3848,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveRowMaterialProblem() { + BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3832,7 +3857,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem { - RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)), + RowMaterialProblemId = values.Value("RowMaterialProblemId"), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3858,6 +3883,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveConstructionProblems() { + BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvConstructionProblems.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3866,7 +3892,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems { - ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)), + ConstructionProblemsId = values.Value("ConstructionProblemsId"), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3895,6 +3921,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// void saveNextQualityControl() { + BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId); List detailLists = new List(); JArray teamGroupData = gvNextQualityControl.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) @@ -3903,7 +3930,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //int rowIndex = teamGroupRow.Value("index"); Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl { - NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)), + NextQualityControlId = values.Value("NextQualityControlId"), ReportId = ReportId, NextQualityControlContent = values.Value("NextQualityControlContent") }; 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 @@ - +