20250125 质量月报

2025-01-24 14:29:31 +08:00
parent 02c2410b2f
commit 85bd05b848
11 changed files with 331 additions and 135 deletions
@@ -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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("id"));
                list.Add(values);
            }
            JObject defaultObj = new JObject
@@ -2462,7 +2462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// <param name="e"></param>
        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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("id"));
                list.Add(values);
            }
            JObject defaultObj = new JObject
@@ -2517,7 +2517,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// <param name="e"></param>
        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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("id"));
                list.Add(values);
            }
            JObject defaultObj = new JObject
@@ -2586,7 +2586,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
        /// <param name="e"></param>
        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<JObject>("values");
-                values.Add("Id", teamGroupRow.Value<string>("id"));
+                //values.Add("Id", teamGroupRow.Value<string>("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<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
            JArray teamGroupData = Grid1.GetMergedData();
            foreach (JObject teamGroupRow in teamGroupData)
@@ -2909,7 +2911,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"),
@@ -2936,6 +2938,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)
@@ -2944,7 +2947,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"),
@@ -2972,6 +2975,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)
@@ -2980,7 +2984,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"),
@@ -3006,6 +3010,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)
@@ -3014,7 +3019,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"),
@@ -3041,6 +3046,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)
@@ -3049,7 +3055,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"),
@@ -3077,6 +3083,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)
@@ -3085,7 +3092,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"),
@@ -3113,6 +3120,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)
@@ -3121,7 +3129,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"),
@@ -3149,6 +3157,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)
@@ -3157,7 +3166,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"),
@@ -3246,7 +3255,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)
@@ -3255,7 +3264,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"),
@@ -3281,6 +3290,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)
@@ -3289,7 +3299,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"),
@@ -3317,6 +3327,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)
@@ -3325,7 +3336,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"),
@@ -3352,6 +3363,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)
@@ -3360,7 +3372,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"),
@@ -3388,6 +3400,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)
@@ -3396,7 +3409,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"),
@@ -3423,6 +3436,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)
@@ -3431,7 +3445,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"),
@@ -3458,6 +3472,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)
@@ -3466,7 +3481,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"),
@@ -3493,6 +3508,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)
@@ -3501,7 +3517,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"),
@@ -3528,6 +3544,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)
@@ -3536,7 +3553,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"),
@@ -3569,6 +3586,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)
@@ -3577,7 +3595,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")),
@@ -3605,6 +3623,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)
@@ -3613,7 +3632,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")),
@@ -3641,6 +3660,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)
@@ -3649,7 +3669,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")),
@@ -3677,6 +3697,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)
@@ -3685,7 +3706,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"),
@@ -3714,6 +3735,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)
@@ -3722,7 +3744,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"),
@@ -3751,6 +3773,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)
@@ -3759,7 +3782,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"),
@@ -3787,6 +3810,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)
@@ -3795,7 +3819,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"),
@@ -3824,6 +3848,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)
@@ -3832,7 +3857,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>("RowMaterialProblemId"),
                    ReportId = ReportId,
                    UnitId = values.Value<string>("UnitId"),
                    ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@@ -3858,6 +3883,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)
@@ -3866,7 +3892,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>("ConstructionProblemsId"),
                    ReportId = ReportId,
                    UnitId = values.Value<string>("UnitId"),
                    ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@@ -3895,6 +3921,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)
@@ -3903,7 +3930,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>("NextQualityControlId"),
                    ReportId = ReportId,
                    NextQualityControlContent = values.Value<string>("NextQualityControlContent")
                };