From 64efd16704765d27ac8c666e0aaaf151443bc0de Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 22 Jan 2025 17:36:29 +0800 Subject: [PATCH] =?UTF-8?q?20250122=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 --- .../ManageReportNew/MonthReportEdit.aspx.cs | 254 ++++++++++-------- SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 3 files changed, 137 insertions(+), 121 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 12a763e6..e6c30cbb 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -2969,7 +2969,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)), ReportId = ReportId, ProStage = values.Value("ProStage"), ProDescribe = values.Value("ProDescribe"), @@ -2978,10 +2978,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Remarks = values.Value("Remarks"), SortId = rowIndex + 1 }; - if (Grid1.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid1.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3004,7 +3004,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "5", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3012,10 +3012,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2 = values.Value("Quantity2"), Remarks = values.Value("Remarks"), }; - if (Grid9.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid9.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid9.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid9.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3040,7 +3040,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "0", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3048,10 +3048,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2 = values.Value("Quantity2"), Remarks = values.Value("Remarks") }; - if (Grid2.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid2.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid2.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid2.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3074,7 +3074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "1", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3083,10 +3083,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity3 = values.Value("Quantity3"), Remarks = values.Value("Remarks") }; - if (Grid3.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid3.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid3.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid3.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3109,7 +3109,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "2", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3117,10 +3117,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2 = values.Value("Quantity2"), Remarks = values.Value("Remarks") }; - if (Grid4.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid4.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid4.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid4.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3145,7 +3145,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "3", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3153,10 +3153,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2 = values.Value("Quantity2"), Remarks = values.Value("Remarks") }; - if (Grid5.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid5.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid5.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid5.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3181,7 +3181,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "4", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3189,10 +3189,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Quantity2 = values.Value("Quantity2"), Remarks = values.Value("Remarks") }; - if (Grid6.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid6.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid6.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid6.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3217,7 +3217,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew int rowIndex = teamGroupRow.Value("index"); Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan { - //Id = values.Value("Id"), + Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)), ReportId = ReportId, ReType = "6", UnitOrMajor = values.Value("UnitOrMajor"), @@ -3226,10 +3226,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew QuaRate = values.Value("QuaRate"), Remarks = values.Value("Remarks") }; - if (Grid11.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = Grid11.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (Grid11.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = Grid11.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3315,6 +3315,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)), ReportId = ReportId, ReType = "9", ContentName = values.Value("ContentName"), @@ -3323,10 +3324,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks") }; - if (gvMeasuringInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvMeasuringInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvMeasuringInspection.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvMeasuringInspection.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3348,23 +3349,21 @@ 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)), ReportId = ReportId, ReType = "10-1", ContentName = values.Value("WorkName"), - MonthsCount = values.Value("CheckNum"), //当前检查点数 MonthsBackCount = values.Value("TotalCheckNum"),//累计点数 - ProjectCount = values.Value("OKNum"),//当前合格点数 TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数 - RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (gvTj.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvTj.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvTj.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvTj.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3383,6 +3382,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)), ReportId = ReportId, ReType = "10-2", ContentName = values.Value("WorkName"), @@ -3395,10 +3395,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (GvSb.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = GvSb.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (GvSb.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = GvSb.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3417,6 +3417,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)), ReportId = ReportId, ReType = "10-3", ContentName = values.Value("WorkName"), @@ -3429,10 +3430,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (GvGD.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = GvGD.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (GvGD.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = GvGD.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3452,6 +3453,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)), ReportId = ReportId, ReType = "10-4", ContentName = values.Value("WorkName"), @@ -3464,10 +3466,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (GvDq.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = GvDq.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (GvDq.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = GvDq.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3486,6 +3488,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)), ReportId = ReportId, ReType = "10-5", ContentName = values.Value("WorkName"), @@ -3498,10 +3501,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (GvYb.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = GvYb.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (GvYb.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = GvYb.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3520,6 +3523,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)), ReportId = ReportId, ReType = "10-6", ContentName = values.Value("WorkName"), @@ -3532,10 +3536,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (GvFf.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = GvFf.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (GvFf.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = GvFf.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3554,6 +3558,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)), ReportId = ReportId, ReType = "10-7", ContentName = values.Value("WorkName"), @@ -3566,10 +3571,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("OneOKRate"),//本月合格点数 Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数 }; - if (GvXf.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = GvXf.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (GvXf.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = GvXf.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3588,6 +3593,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)), ReportId = ReportId, ReType = "10", ContentName = values.Value("WorkName"), @@ -3602,10 +3608,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Remarks = values.Value("Remarks"),//本月累计合格点数 }; - if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvInspectionDataInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + ////if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0) + ////{ + //// newDetail.Id = gvInspectionDataInspection.Rows[rowIndex].DataKeys[0].ToString(); + ////} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3628,6 +3634,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)), ReportId = ReportId, ReType = "11", TotalNoBackCount = values.Value("TotalNoBackCount"), @@ -3637,10 +3644,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; - if (gvPressureInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvPressureInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvPressureInspection.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvPressureInspection.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3663,6 +3670,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)), ReportId = ReportId, ReType = "12", TotalNoBackCount = values.Value("TotalNoBackCount"), @@ -3672,10 +3680,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; - if (gvPipingInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvPipingInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvPipingInspection.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvPipingInspection.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3698,6 +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)), ReportId = ReportId, ReType = "13", TotalNoBackCount = values.Value("TotalNoBackCount"), @@ -3707,10 +3716,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks"), }; - if (gvSpecialInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvSpecialInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvSpecialInspection.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvSpecialInspection.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3733,6 +3742,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)), ReportId = ReportId, ReType = "14", ContentName = values.Value("WorkName"), @@ -3741,10 +3751,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew TotalNoBackCount = values.Value("CheckNum"), RectificationRate = values.Value("OKRate"), }; - if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvNcrManagementInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvNcrManagementInspection.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3769,6 +3779,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)), ReportId = ReportId, ReType = "1", ContentName = values.Value("ContentName"), @@ -3777,10 +3788,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew RectificationRate = values.Value("RectificationRate"), Remarks = values.Value("Remarks") }; - if (gvQualityInspection.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvQualityInspection.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvQualityInspection.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvQualityInspection.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3805,6 +3816,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)), ReportId = ReportId, ReType = "2", ContentName = values.Value("ContentName"), @@ -3812,10 +3824,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ProjectCount = values.Value("ProjectCount"), Remarks = values.Value("Remarks") }; - if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvSpecialCheck.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvSpecialCheck.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3840,6 +3852,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)), ReportId = ReportId, ReType = "3", ContentName = values.Value("ContentName"), @@ -3848,10 +3861,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew MonthsBackCount = Funs.GetNewInt(values.Value("MonthsBackCount").ToString()), TotalNoBackCount = Funs.GetNewInt(values.Value("TotalNoBackCount").ToString()) }; - if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.Id = gvFileReport.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.Id = gvFileReport.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3876,6 +3889,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)), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3883,10 +3897,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ProcessingResults = values.Value("ProcessingResults"), Remark = values.Value("Remark") }; - if (gvRowMaterialProblem.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.RowMaterialProblemId = gvRowMaterialProblem.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvRowMaterialProblem.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.RowMaterialProblemId = gvRowMaterialProblem.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3909,6 +3923,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)), ReportId = ReportId, UnitId = values.Value("UnitId"), ProblemDesrioption = values.Value("ProblemDesrioption"), @@ -3916,10 +3931,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ProcessingResults = values.Value("ProcessingResults"), Remark = values.Value("Remark") }; - if (gvConstructionProblems.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.ConstructionProblemsId = gvConstructionProblems.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvConstructionProblems.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.ConstructionProblemsId = gvConstructionProblems.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) @@ -3945,13 +3960,14 @@ 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)), ReportId = ReportId, NextQualityControlContent = values.Value("NextQualityControlContent") }; - if (gvNextQualityControl.Rows[rowIndex].DataKeys.Length > 0) - { - newDetail.NextQualityControlId = gvNextQualityControl.Rows[rowIndex].DataKeys[0].ToString(); - } + //if (gvNextQualityControl.Rows[rowIndex].DataKeys.Length > 0) + //{ + // newDetail.NextQualityControlId = gvNextQualityControl.Rows[rowIndex].DataKeys[0].ToString(); + //} detailLists.Add(newDetail); } if (detailLists.Count > 0) diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 4036b78c..58dd68d6 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index d989db4f..59ad2199 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true