20250125 质量月报

2025-01-24 14:29:31 +08:00
parent 02c2410b2f
commit 85bd05b848
11 changed files with 331 additions and 135 deletions
@@ -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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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
        /// <param name="e"></param>
        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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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();
        }

        /// <summary>
@@ -2582,7 +2584,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// <param name="e"></param>
        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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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();
        }

        /// <summary>
@@ -2651,7 +2654,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// <param name="e"></param>
        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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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();
        }

        /// <summary>
@@ -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<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
            JArray teamGroupData = Grid1.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -2969,7 +2975,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ProStage = values.Value<string>("ProStage"),
                    ProDescribe = values.Value<string>("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<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid9.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3004,7 +3011,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "5",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3032,6 +3039,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveYbsgfa()
        {
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0");
            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid2.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3040,7 +3048,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "0",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3066,6 +3074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveWdgcfa()
        {
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1");
            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid3.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3074,7 +3083,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "1",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3101,6 +3110,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveJysyjh()
        {
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2");
            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid4.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3109,7 +3119,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "2",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3137,6 +3147,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveSjjd()
        {
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3");
            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid5.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3145,7 +3156,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "3",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3173,6 +3184,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveTzhs()
        {
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4");
            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid6.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3181,7 +3193,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "4",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3209,6 +3221,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveSbclBy()
        {
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6");
            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
            JArray teamGroupData = Grid11.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3217,7 +3230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "6",
                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
@@ -3306,7 +3319,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        #region 9.计量器具报验管理情况
        void saveMeasuringInspection()
        {
-
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvMeasuringInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3315,7 +3328,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "9",
                    ContentName = values.Value<string>("ContentName"),
@@ -3341,6 +3354,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        #region 10.现场质量共检数据
        void saveTjInspection()  //检验批统计:土建
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvTj.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3349,7 +3363,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-1",
                    ContentName = values.Value<string>("WorkName"),
@@ -3374,6 +3388,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        }
        void saveSbInspection() //检验批统计:设备
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = GvSb.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3382,7 +3397,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-2",
                    ContentName = values.Value<string>("WorkName"),
@@ -3407,6 +3422,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        }
        void saveGDInspection() //检验批统计:管道
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = GvGD.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3415,7 +3431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-3",
                    ContentName = values.Value<string>("WorkName"),
@@ -3441,6 +3457,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew

        void saveDQInspection() //检验批统计:电气
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = GvDq.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3449,7 +3466,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-4",
                    ContentName = values.Value<string>("WorkName"),
@@ -3476,6 +3493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        }
        void saveYBInspection() //检验批统计:仪表
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = GvYb.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3484,7 +3502,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-5",
                    ContentName = values.Value<string>("WorkName"),
@@ -3511,6 +3529,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        }
        void saveFFInspection()  //检验批统计:防腐
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = GvFf.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3519,7 +3538,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-6",
                    ContentName = values.Value<string>("WorkName"),
@@ -3546,6 +3565,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        }
        void saveXFInspection()  //检验批统计:消防
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = GvXf.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3554,7 +3574,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10-7",
                    ContentName = values.Value<string>("WorkName"),
@@ -3581,6 +3601,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        }
        void saveInspectionDataInspection()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvInspectionDataInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3589,7 +3610,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "10",
                    ContentName = values.Value<string>("WorkName"),
@@ -3622,6 +3643,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        #region 11.压力管道监检情况
        void savePressureInspection()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvPressureInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3630,7 +3652,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "11",
                    TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@@ -3658,6 +3680,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        #region 12.管道试压包管理情况
        void savePipingInspection()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvPipingInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3666,7 +3689,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "12",
                    TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@@ -3694,6 +3717,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        #region 13.特种设备监检情况
        void saveSpecialInspection()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvSpecialInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3702,7 +3726,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "13",
                    TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@@ -3730,6 +3754,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        #region 14.NCR管理情况
        void saveNcrManagementInspection()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvNcrManagementInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3738,7 +3763,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "14",
                    ContentName = values.Value<string>("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
        /// </summary>
        void saveQualityInspection()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvQualityInspection.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3775,7 +3802,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "1",
                    ContentName = values.Value<string>("ContentName"),
@@ -3804,6 +3831,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveSpecialCheck()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"2");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvSpecialCheck.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3812,7 +3840,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "2",
                    ContentName = values.Value<string>("ContentName"),
@@ -3840,6 +3868,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveFileReport()
        {
+            BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"3");
            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
            JArray teamGroupData = gvFileReport.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3848,7 +3877,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
                {
-                    Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
+                    Id = values.Value<string>("Id"),
                    ReportId = ReportId,
                    ReType = "3",
                    ContentName = values.Value<string>("ContentName"),
@@ -3877,6 +3906,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveRowMaterialProblem()
        {
+            BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
            List<Model.Report_RowMaterialProblem> detailLists = new List<Model.Report_RowMaterialProblem>();
            JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3885,7 +3915,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
                {
-                    RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)),
+                    RowMaterialProblemId = values.Value<string>("Id"),
                    ReportId = ReportId,
                    UnitId = values.Value<string>("UnitId"),
                    ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@@ -3911,6 +3941,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveConstructionProblems()
        {
+            BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
            List<Model.Report_ConstructionProblems> detailLists = new List<Model.Report_ConstructionProblems>();
            JArray teamGroupData = gvConstructionProblems.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3919,7 +3950,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
                {
-                    ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)),
+                    ConstructionProblemsId = values.Value<string>("Id"),
                    ReportId = ReportId,
                    UnitId = values.Value<string>("UnitId"),
                    ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@@ -3948,6 +3979,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// </summary>
        void saveNextQualityControl()
        {
+            BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
            List<Model.Report_NextQualityControl> detailLists = new List<Model.Report_NextQualityControl>();
            JArray teamGroupData = gvNextQualityControl.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -3956,7 +3988,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                //int rowIndex = teamGroupRow.Value<int>("index");
                Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
                {
-                    NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)),
+                    NextQualityControlId = values.Value<string>("Id"),
                    ReportId = ReportId,
                    NextQualityControlContent = values.Value<string>("NextQualityControlContent")
                };