Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

2024-04-24 17:14:30 +08:00
parent 6aff0e6af8 0e66fec516
commit f9823ff108
60 changed files with 2964 additions and 1289 deletions
@@ -121,6 +121,7 @@ namespace BLL
            newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;

            newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
+            newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode;
            db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
            db.SubmitChanges();
        }
@@ -102,6 +102,7 @@ namespace BLL
            newPressurePipe.CompileMan = PressurePipe.CompileMan;
            newPressurePipe.Status = PressurePipe.Status;
            newPressurePipe.ReportTime = PressurePipe.ReportTime;
+            newPressurePipe.RemarkCode = PressurePipe.RemarkCode;
            db.Comprehensive_PressurePipe.InsertOnSubmit(newPressurePipe);
            db.SubmitChanges();
        }
@@ -101,6 +101,7 @@ namespace BLL
            newQualityAccident.CompileDate = QualityAccident.CompileDate;
            newQualityAccident.UnitWorkId = QualityAccident.UnitWorkId;
            newQualityAccident.Status = QualityAccident.Status;
+            newQualityAccident.RemarkCode = QualityAccident.RemarkCode;
            db.Comprehensive_QualityAccident.InsertOnSubmit(newQualityAccident);
            db.SubmitChanges();
        }
@@ -106,6 +106,7 @@ namespace BLL
            newEquipment.CompileMan = SpecialEquipment.CompileMan;
            newEquipment.Status = SpecialEquipment.Status;
            newEquipment.PositionNum = SpecialEquipment.PositionNum;
+            newEquipment.RemarkCode = SpecialEquipment.RemarkCode;
            db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment);
            db.SubmitChanges();
        }
@@ -3275,6 +3275,27 @@ namespace BLL
        /// 施工组织设计及施工方案导入模板文件原始虚拟路径
        /// </summary>
        public const string GeneralPlanApprovalTemplateUrl = "File\\Excel\\DataIn\\施工组织设计及施工方案导入模板.xls";
+
+        /// <summary>
+        /// 超过一定规模的危大施工方案导入模板文件原始虚拟路径
+        /// </summary>
+        public const string MajorPlanApprovalTemplateUrl = "File\\Excel\\DataIn\\超过一定规模的危大施工方案导入模板.xls";
+
+        /// <summary>
+        /// 特种设备管理导入模板原始虚拟路径
+        /// </summary>
+        public const string SpecialEquipmentTemplateUrl = "File\\Excel\\DataIn\\特种设备管理导入模板.xls";
+
+        /// <summary>
+        /// 压力管道管理导入模板原始虚拟路径
+        /// </summary>
+        public const string PressurePipeTemplateUrl = "File\\Excel\\DataIn\\压力管道管理导入模板.xls";
+
+        /// <summary>
+        /// 质量事故处理记录导入模板原始虚拟路径
+        /// </summary>
+        public const string QualityAccidentTemplateUrl = "File\\Excel\\DataIn\\质量事故处理记录导入模板.xls";
+
        #endregion

        #region 绩效考核模板文件路径