优化

APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT_PRODUCTION_UNIT.cs

@@ -26,6 +26,12 @@ namespace APT.BaseData.Domain.Entities.FM
         /// 导航：生产单元枚举
         /// </summary>
         [Description("导航：生产单元枚举")]
-        public virtual T_FM_ENUMS Nav_Enums { get; set; }
+        public virtual T_FM_ENUMS Nav_Enums { get; set; }
+
+        [Description("生产单元")]
+        [DataFieldForeignKey("Nav_DepartUnit")]
+        public Guid? DEPART_UNIT_ID { get; set; }
+        [Description("导航属性：生产单元")]
+        public T_FM_USER_PRODUCTION_UNIT_SET Nav_DepartUnit { get; set; }
     }
 }

APT.BaseData.Domain/Entities/FM/T_FM_USER_PRODUCTION_UNIT.cs

@@ -26,6 +26,12 @@ namespace APT.BaseData.Domain.Entities.FM
         /// 导航：生产单元枚举
         /// </summary>
         [Description("导航：生产单元枚举")]
-        public virtual T_FM_ENUMS Nav_Enums { get; set; }
+        public virtual T_FM_ENUMS Nav_Enums { get; set; }
+
+        [Description("生产单元")]
+        [DataFieldForeignKey("Nav_Unit")]
+        public Guid? PRODUCTION_UNIT_ID { get; set; }
+        [Description("导航属性：生产单元")]
+        public T_FM_USER_PRODUCTION_UNIT_SET Nav_Unit { get; set; }
     }
 }

APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs

@@ -13022,6 +13022,7 @@ namespace APT.BaseData.Services.DomainServices
                                 T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
                                 ideDetail.ORG_ID = entity.ORG_ID;
                                 ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
+                                ideDetail.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
                                 ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
                                 ideDetail.MineType = item.MineType;
                                 ideDetail.AREA_ID = item.AREA_ID;
@@ -13393,6 +13394,8 @@ namespace APT.BaseData.Services.DomainServices
                             ideDetail.IDENTIFY_DEPARTMENT = de.IDENTIFY_DEPARTMENT;
                             ideDetail.IDENTIFY_POST = de.IDENTIFY_POST;
                             ideDetail.MARK = de.MARK;
+                            ideDetail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID;
+                            ideDetail.ENABLE_STATUS = de.ENABLE_STATUS;
                             summaryDetails.Add(ideDetail);
                         }
                     }
@@ -13590,6 +13593,8 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE;
                                     detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL;
                                     detail.MARK = de.MARK;
+                                    detail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID;
+                                    detail.ENABLE_STATUS = de.ENABLE_STATUS;
                                     detail.MEASURE = de.MEASURE;
                                     if (departTemp != null)
                                     {
@@ -13993,6 +13998,8 @@ namespace APT.BaseData.Services.DomainServices
                             detail.EMERGENCY = de.EMERGENCY;
                             detail.EVALUATE_LEVEL = de.EVALUATE_LEVEL;
                             detail.MARK = de.MARK;
+                            detail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID;
+                            detail.ENABLE_STATUS = de.ENABLE_STATUS;
                             detail.MEASURE = de.MEASURE;
                             resultDetails.Add(detail);
                             if (de.Nav_DetailMeasures != null && de.Nav_DetailMeasures.Any())
@@ -14133,7 +14140,9 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
                                     detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
                                     detail.EMERGENCY = item.EMERGENCY;
-                                    detail.MARK = item.MARK;
+                                    detail.MARK = item.MARK;
+                                    detail.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
+                                    detail.ENABLE_STATUS = item.ENABLE_STATUS;
                                     douDetails.Add(detail);
                                     var ldeparts = detailDeparts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
                                     if (ldeparts.Any())
@@ -14455,7 +14464,9 @@ namespace APT.BaseData.Services.DomainServices
                         detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
                         detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
                         detail.EMERGENCY = item.EMERGENCY;
-                        detail.MARK = item.MARK;
+                        detail.MARK = item.MARK;
+                        detail.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
+                        detail.ENABLE_STATUS = item.ENABLE_STATUS;
                         details.Add(detail);
                         var ldeparts = sumDetailDeparts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
                         if (ldeparts.Any())

APT.Data.Migrations/Migrations/20251113064111_hmr2025111301.cs

@@ -0,0 +1,191 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025111301 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_IDENTIFY_RESULT_DETAIL",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_IDENTIFY_DETAIL",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ENABLE_STATUS",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ENABLE_STATUS",
+                table: "T_SK_RISK_EVALUATION_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ENABLE_STATUS",
+                table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "FIRE_STATUS",
+                table: "T_FO_FIRE_JOB_WB",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "FIRE_STATUS",
+                table: "T_FO_FIRE_JOB",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "PRODUCTION_UNIT_ID",
+                table: "T_FM_USER_PRODUCTION_UNIT",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "DEPART_UNIT_ID",
+                table: "T_FM_DEPARTMENT_PRODUCTION_UNIT",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FM_USER_PRODUCTION_UNIT_PRODUCTION_UNIT_ID",
+                table: "T_FM_USER_PRODUCTION_UNIT",
+                column: "PRODUCTION_UNIT_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FM_DEPARTMENT_PRODUCTION_UNIT_DEPART_UNIT_ID",
+                table: "T_FM_DEPARTMENT_PRODUCTION_UNIT",
+                column: "DEPART_UNIT_ID");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_FM_DEPARTMENT_PRODUCTION_UNIT_T_FM_USER_PRODUCTION_UNIT_SET_DEPART_UNIT_ID",
+                table: "T_FM_DEPARTMENT_PRODUCTION_UNIT",
+                column: "DEPART_UNIT_ID",
+                principalTable: "T_FM_USER_PRODUCTION_UNIT_SET",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_FM_USER_PRODUCTION_UNIT_T_FM_USER_PRODUCTION_UNIT_SET_PRODUCTION_UNIT_ID",
+                table: "T_FM_USER_PRODUCTION_UNIT",
+                column: "PRODUCTION_UNIT_ID",
+                principalTable: "T_FM_USER_PRODUCTION_UNIT_SET",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_FM_DEPARTMENT_PRODUCTION_UNIT_T_FM_USER_PRODUCTION_UNIT_SET_DEPART_UNIT_ID",
+                table: "T_FM_DEPARTMENT_PRODUCTION_UNIT");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_FM_USER_PRODUCTION_UNIT_T_FM_USER_PRODUCTION_UNIT_SET_PRODUCTION_UNIT_ID",
+                table: "T_FM_USER_PRODUCTION_UNIT");
+
+            migrationBuilder.DropIndex(
+                name: "IX_T_FM_USER_PRODUCTION_UNIT_PRODUCTION_UNIT_ID",
+                table: "T_FM_USER_PRODUCTION_UNIT");
+
+            migrationBuilder.DropIndex(
+                name: "IX_T_FM_DEPARTMENT_PRODUCTION_UNIT_DEPART_UNIT_ID",
+                table: "T_FM_DEPARTMENT_PRODUCTION_UNIT");
+
+            migrationBuilder.DropColumn(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_IDENTIFY_RESULT_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_IDENTIFY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENABLE_STATUS",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENABLE_STATUS",
+                table: "T_SK_RISK_EVALUATION_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_RISK_EVALUATION_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENABLE_STATUS",
+                table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ENTERPRISE_LIBRARY_ID",
+                table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "FIRE_STATUS",
+                table: "T_FO_FIRE_JOB_WB");
+
+            migrationBuilder.DropColumn(
+                name: "FIRE_STATUS",
+                table: "T_FO_FIRE_JOB");
+
+            migrationBuilder.DropColumn(
+                name: "PRODUCTION_UNIT_ID",
+                table: "T_FM_USER_PRODUCTION_UNIT");
+
+            migrationBuilder.DropColumn(
+                name: "DEPART_UNIT_ID",
+                table: "T_FM_DEPARTMENT_PRODUCTION_UNIT");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -2122,6 +2122,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<Guid>("DEPARTMENT_ID")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<Guid?>("DEPART_UNIT_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -2157,6 +2160,8 @@ namespace APT.Data.Migrations.Migrations
 
                     b.HasIndex("DEPARTMENT_ID");
 
+                    b.HasIndex("DEPART_UNIT_ID");
+
                     b.HasIndex("ENUMS_ID");
 
                     b.HasIndex("ORG_ID");
@@ -8225,6 +8230,9 @@ namespace APT.Data.Migrations.Migrations
                         .IsRequired()
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<Guid?>("PRODUCTION_UNIT_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<Guid>("USER_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -8234,6 +8242,8 @@ namespace APT.Data.Migrations.Migrations
 
                     b.HasIndex("ORG_ID");
 
+                    b.HasIndex("PRODUCTION_UNIT_ID");
+
                     b.HasIndex("USER_ID");
 
                     b.ToTable("T_FM_USER_PRODUCTION_UNIT");
@@ -32972,6 +32982,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<Guid?>("FIRE_DEPARTMENT_ID")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<int>("FIRE_STATUS")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("FIRE_USER_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -33618,6 +33631,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int>("EVALUATE_LEVEL")
                         .HasColumnType("int");
 
+                    b.Property<int>("FIRE_STATUS")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("FLOW_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -76988,6 +77004,12 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<int>("ENABLE_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -82779,6 +82801,12 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<int>("ENABLE_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -83365,6 +83393,12 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
 
+                    b.Property<int>("ENABLE_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -83962,6 +83996,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int>("ENABLE_STATUS")
                         .HasColumnType("int");
 
+                    b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -84532,6 +84569,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int>("ENABLE_STATUS")
                         .HasColumnType("int");
 
+                    b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -84926,6 +84966,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int>("ENABLE_STATUS")
                         .HasColumnType("int");
 
+                    b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<int>("ENTITY_ORG_TPYE")
                         .HasColumnType("int");
 
@@ -97819,6 +97862,11 @@ namespace APT.Data.Migrations.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER_PRODUCTION_UNIT_SET", "Nav_DepartUnit")
+                        .WithMany()
+                        .HasForeignKey("DEPART_UNIT_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_ENUMS", "Nav_Enums")
                         .WithMany()
                         .HasForeignKey("ENUMS_ID")
@@ -97832,6 +97880,8 @@ namespace APT.Data.Migrations.Migrations
 
                     b.Navigation("Nav_Department");
 
+                    b.Navigation("Nav_DepartUnit");
+
                     b.Navigation("Nav_Enums");
 
                     b.Navigation("Nav_Org");
@@ -99576,6 +99626,11 @@ namespace APT.Data.Migrations.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER_PRODUCTION_UNIT_SET", "Nav_Unit")
+                        .WithMany()
+                        .HasForeignKey("PRODUCTION_UNIT_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_User")
                         .WithMany("Nav_ProdutionUnit")
                         .HasForeignKey("USER_ID")
@@ -99586,6 +99641,8 @@ namespace APT.Data.Migrations.Migrations
 
                     b.Navigation("Nav_Org");
 
+                    b.Navigation("Nav_Unit");
+
                     b.Navigation("Nav_User");
                 });
 

APT.MS.Data/Mapping/T4/T4Map.cs

@@ -15315,6 +15315,7 @@ builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelet
 			base.Configure(builder);
 			builder.HasOne(t => t.Nav_Department).WithMany(t=>t.Nav_ProdutionUnit).HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_Enums).WithMany().HasForeignKey(t => t.ENUMS_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_DepartUnit).WithMany().HasForeignKey(t => t.DEPART_UNIT_ID).OnDelete(DeleteBehavior.Restrict);
 		} 
      }
 	 #endregion
@@ -15783,6 +15784,7 @@ builder.Property(t => t.REMARK).HasMaxLength(500);
 			base.Configure(builder);
 			builder.HasOne(t => t.Nav_User).WithMany(t=>t.Nav_ProdutionUnit).HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_Enums).WithMany().HasForeignKey(t => t.ENUMS_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_Unit).WithMany().HasForeignKey(t => t.PRODUCTION_UNIT_ID).OnDelete(DeleteBehavior.Restrict);
 		} 
      }
 	 #endregion

APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB.cs

@@ -241,5 +241,9 @@ namespace APT.MS.Domain.Entities.FO
         [Description("提交并通知")]
         [DataFieldIngore]
         public string PUBLISH { get; set; }
+
+        [Description("动火流程状态")]
+        [EnumName("FOFireStatus")]
+        public FOFireStatus FIRE_STATUS { get; set; }
     }
 }

APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB.cs

@@ -232,6 +232,8 @@ namespace APT.MS.Domain.Entities.FO
         [DataFieldIngore]
         public string PUBLISH { get; set; }
 
-
+        [Description("动火流程状态")]
+        [EnumName("FOFireStatus")]
+        public FOFireStatus FIRE_STATUS { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs

@@ -150,6 +150,16 @@ namespace APT.MS.Domain.Entities.SK
         /// 标识
         /// </summary>
         [Description("标识")]
-        public SKMarkEnum MARK { get; set; }
+        public SKMarkEnum MARK { get; set; }
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [Description("是否有效")]
+        [EnumName("SKEnableStatusEnum")]
+        public SKEnableStatusEnum ENABLE_STATUS { get; set; }
+
+        [Description("企业库ID")]
+
+        public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs

@@ -155,6 +155,16 @@ namespace APT.MS.Domain.Entities.SK
         /// 标识
         /// </summary>
         [Description("标识")]
-        public SKMarkEnum MARK { get; set; }
+        public SKMarkEnum MARK { get; set; }
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [Description("是否有效")]
+        [EnumName("SKEnableStatusEnum")]
+        public SKEnableStatusEnum ENABLE_STATUS { get; set; }
+
+        [Description("企业库ID")]
+
+        public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs

@@ -157,10 +157,20 @@ namespace APT.MS.Domain.Entities.SK
         /// </summary>
         [Description("标识")]
         public SKMarkEnum MARK { get; set; }
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [Description("是否有效")]
+        [EnumName("SKEnableStatusEnum")]
+        public SKEnableStatusEnum ENABLE_STATUS { get; set; }
 
         [Description("辨识部门")]
         public string EVALUATION_DEPARTMENT { get; set; }
         [Description("辨识岗位")]
-        public string EVALUATION_POST { get; set; }
+        public string EVALUATION_POST { get; set; }
+
+        [Description("企业库ID")]
+
+        public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_DETAIL.cs

@@ -103,6 +103,10 @@ namespace APT.MS.Domain.Entities.SK
         [Description("管控措施")]
         public string MEASURE { get; set; }
         [Description("应急处置")]
-        public string EMERGENCY { get; set; }
+        public string EMERGENCY { get; set; }
+
+        [Description("企业库ID")]
+
+        public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_DETAIL.cs

@@ -116,6 +116,10 @@ namespace APT.MS.Domain.Entities.SK
         [Description("辨识部门")]
         public string IDENTIFY_DEPARTMENT { get; set; }
         [Description("辨识岗位")]
-        public string IDENTIFY_POST { get; set; }
+        public string IDENTIFY_POST { get; set; }
+
+        [Description("企业库ID")]
+
+        public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL.cs

@@ -116,6 +116,9 @@ namespace APT.MS.Domain.Entities.SK
         [Description("辨识部门")]
         public string IDENTIFY_DEPARTMENT { get; set; }
         [Description("辨识岗位")]
-        public string IDENTIFY_POST { get; set; }
+        public string IDENTIFY_POST { get; set; }
+        [Description("企业库ID")]
+
+        public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
     }
 }

APT.MS.Domain/Enums/FO/FOShiftRecordEnum.cs

@@ -226,5 +226,55 @@ namespace APT.MS.Domain.Enums
         Ing = 5,
         [Description("作业后")]
         After = 10,
+    }
+    public enum FOFireStatus
+    {
+        /// <summary>
+        /// 草稿  0
+        /// </summary>
+        [Description("草稿")]
+        Draft = 0,
+        /// <summary>
+        /// 审核中 
+        /// </summary>
+        [Description("审核中")]
+        Approving = 5,
+        /// <summary>
+        /// 审核完成 
+        /// </summary>
+        [Description("审核完成")]
+        ApprovingFinish = 6,
+        /// <summary>
+        /// 动火人员确认  10
+        /// </summary>
+        [Description("动火人员确认")]
+        Sign = 10,
+        /// <summary>
+        /// 审阅中 15
+        /// </summary>
+        [Description("审阅中")]
+        Reading = 15,
+        /// <summary>
+        /// 监护人 18
+        /// </summary>
+        [Description("监护人")]
+        Monitor = 18,
+        /// <summary>
+        /// 完工审阅 21
+        /// </summary>
+        [Description("完工审阅")]
+        ReadingFinish = 21,
+
+        /// <summary>
+        /// 已归档 30 
+        /// </summary>
+        [Description("已归档")]
+        Archived = 30,
+
+        /// <summary>
+        /// 已驳回 40
+        /// </summary>
+        [Description("已驳回")]
+        Rejected = 40
     }
 }

APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs

@@ -428,9 +428,10 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                     departmentList.ForEach(t =>
                     {
                         t.MineType = entity.MineType;
+                        t.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
                         T_FM_DEPARTMENT_PRODUCTION_UNIT unit = new T_FM_DEPARTMENT_PRODUCTION_UNIT();
                         unit.ORG_ID = t.ORG_ID; unit.DEPARTMENT_ID = t.ID; unit.ENUMS_ID = enumList?.ID;
-                        unit.Nav_Enums = null;
+                        unit.Nav_Enums = null;unit.DEPART_UNIT_ID = entity.PRODUCTION_UNIT_ID;
                         unitList.Add(unit);
                         if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any())
                         {
@@ -456,7 +457,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         t.MineType = entity.MineType.ToString();
                         T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT();
                         unit.ORG_ID = t.ORG_ID; unit.USER_ID = t.ID; unit.ENUMS_ID = enumList?.ID;
-                        unit.Nav_Enums = null;
+                        unit.Nav_Enums = null;unit.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
                         userUnitList.Add(unit);
                         if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any())
                         {

APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs

@@ -660,13 +660,14 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                 else
                 {
                     var departInfo = this.GetEntity<T_FM_DEPARTMENT>(entity.DEPARTMENT_ID.ToString());
-                    if (departInfo != null && departInfo.MineType != null && !isAdd.Any())
+                    if (departInfo != null && departInfo.PRODUCTION_UNIT_ID != null && departInfo.MineType != null && !isAdd.Any())
                     {
                         var enumList = this.GetEntity<T_FM_ENUMS>(t => t.CODE == "BSMineTypeEnum" && t.VALUE == departInfo.MineType);
                         entity.MineType = departInfo.MineType.ToString();
                         T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT();
                         unit.ORG_ID = entity.ORG_ID; unit.USER_ID = entity.ID; unit.ENUMS_ID = enumList?.ID;
                         unit.Nav_Enums = null;
+                        unit.PRODUCTION_UNIT_ID = departInfo.PRODUCTION_UNIT_ID;
                         entity.Nav_ProdutionUnit = new List<T_FM_USER_PRODUCTION_UNIT>();
                         entity.Nav_ProdutionUnit.Add(unit);
                     }
@@ -904,7 +905,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                     var enumValues = new List<string>();
                     productionUnit.ForEach(t =>
                     {
-                        t.USER_ID = entity.ID; t.Nav_Enums = null;
+                        t.USER_ID = entity.ID; t.Nav_Enums = null;t.Nav_Unit = null;
                         var value = enumList.FirstOrDefault(m => m.ID == t.ENUMS_ID)?.VALUE.ToString();
                         enumValues.Add(value);
                     });

APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs

@@ -252,6 +252,7 @@ namespace APT.FO.WebApi.Controllers
                 {
                     //触发审批
                     entity.STATUS =  BaseData.Domain.Enums.PF.PFStandardStatus.Approving;
+                    entity.FIRE_STATUS = FOFireStatus.Approving;
                     //取审批流水码
                     var sysFilter = new SystemCodeFilter();
                     sysFilter.CodeType = (int)PFCodeRuleType.审批流编码;

APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs

@@ -162,6 +162,20 @@ namespace APT.FO.WebApi.Controllers
                             throw new Exception("作业人员必须要有动火操作人员，请到用户列表配置对应人员类型");
                         }
                     }
+                    var dhCers = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID && t.CERTIFICATE_CODE == null);
+                    if (dhCers != null)
+                    {
+                        throw new Exception("动火操作人员必须填写证书编号");
+                    }
+                    var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID &&(t.Nav_UserFiles == null || !t.Nav_UserFiles.Any()));
+                    if (dhfiles != null)
+                    {
+                        throw new Exception("动火操作人员必须上传附件");
+                    }
+                    if (dhfiles != null)
+                    {
+                        throw new Exception("动火操作人员必须填写证书编号");
+                    }
                     var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员");
                     if (wjUser == null)
                     {
@@ -252,6 +266,7 @@ namespace APT.FO.WebApi.Controllers
                 {
                     //触发审批
                     entity.STATUS =  BaseData.Domain.Enums.PF.PFStandardStatus.Approving;
+                    entity.FIRE_STATUS = FOFireStatus.Approving;
                     //取审批流水码
                     var sysFilter = new SystemCodeFilter();
                     sysFilter.CodeType = (int)PFCodeRuleType.审批流编码;

APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs

@@ -73,6 +73,10 @@ namespace APT.FO.WebApi.Controllers
                 {
                     throw new Exception("交底内容必需填写");
                 }
+                if (string.IsNullOrEmpty(entity.CODE))
+                {
+                    entity.CODE = "AQJD" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
+                }
                 entity.DisclosureContent = entity.DisclosureContent.Trim().Replace(" ", "");
                 if (persons != null && persons.Any())
                 {

APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromTechController.cs

@@ -75,6 +75,10 @@ namespace APT.FO.WebApi.Controllers
                 {
                     throw new Exception("交底内容必需填写");
                 }
+                if (string.IsNullOrEmpty(entity.CODE))
+                {
+                    entity.CODE = "JSJD" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
+                }
                 entity.DisclosureContent = entity.DisclosureContent.Trim().Replace(" ", "");
                 if (persons != null && persons.Any())
                 {

APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs

@@ -1895,6 +1895,74 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                         throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
                 }
 
+                return true;
+            });
+        }
+        /// <summary>
+        /// 动火作业开始前半小时触发工作票给动火人员
+        /// </summary>
+        /// <param name="pageFilter"></param>
+        /// <returns></returns>
+        [HttpPost, Route("FireJobSync")]
+        public JsonActionResult<bool> FireJobSync([FromBody] KeywordFilter filter)
+        {
+            return SafeExecute<bool>(() =>
+            {
+                try
+                {
+                    var notices = new List<T_FM_NOTIFICATION_TASK>();
+                    var dt = DateTime.Now.AddMinutes(-30);
+                    var userType = this.GetEntity<T_FO_USER_TYPE>(t => t.NAME == "动火操作人员");
+                    var steps = this.GetEntities<T_HM_OPERATION_STEP>(t =>t.IS_DELETED ==false, new BaseFilter(filter.OrgId));
+                    var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId));
+                    var jobs = this.GetEntities<T_FO_FIRE_JOB>(t => t.STATUS == BaseData.Domain.Enums.PF.PFStandardStatus.Archived && t.JOB_DATE <= dt, new BaseFilter(filter.OrgId), "Nav_Users");
+                    if (userType!=null &&jobs != null && jobs.Any())
+                    {
+                        foreach (var item in jobs)
+                        {
+                            var step = steps.FirstOrDefault(t => t.ID == item.OPERATION_STEP_ID);
+                            if (item.Nav_Users != null && item.Nav_Users.Any())
+                            {
+                                var sendUser = item.Nav_Users.FirstOrDefault(t => t.USER_TYPE_ID == userType.ID);
+                                if (sendUser != null)
+                                {
+                                    var userName = users.FirstOrDefault(t => t.ID == sendUser.USER_ID)?.NAME;
+                                    var notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业工作票" + step?.NAME, item.ID, item.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
+                                                          DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043");
+                                    notices.Add(notice);
+                                }
+                            }
+                        }
+                    }
+                    var jobWbs = this.GetEntities<T_FO_FIRE_JOB_WB>(t => t.STATUS == BaseData.Domain.Enums.PF.PFStandardStatus.Archived && t.JOB_DATE <= dt, new BaseFilter(filter.OrgId), "Nav_Users");
+                    if (userType != null && jobWbs != null && jobWbs.Any())
+                    {
+                        foreach (var item in jobs)
+                        {
+                            var step = steps.FirstOrDefault(t => t.ID == item.OPERATION_STEP_ID);
+                            if (item.APPLY_USER_ID != null )
+                            {
+                                var userName = users.FirstOrDefault(t => t.ID == item.APPLY_USER_ID)?.NAME;
+                                var notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业工作票(外包)" + step?.NAME, item.ID, item.ORG_ID, (Guid)item.APPLY_USER_ID, userName, DateTime.Now,
+                                                      DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO045");
+                                notices.Add(notice);
+                            }
+                        }
+                    }
+                    UnifiedCommit(() =>
+                    {
+                        if (notices != null && notices.Any())
+                            BantchSaveEntityNoCommit(notices);
+                    });
+                }
+                catch (Exception ex)
+                {
+                    if (!string.IsNullOrEmpty(ex.StackTrace))
+                        throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
+                    else
+                        throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
+                }
+
                 return true;
             });
         }

APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs

@@ -1100,6 +1100,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                                             T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL();
                                                             ideDetail.ORG_ID = filter.OrgId;
                                                             ideDetail.RISK_IDENTIFY_ID = ide.ID;
+                                                            ideDetail.ENTERPRISE_LIBRARY_ID = library?.ID;
                                                             ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID;
                                                             ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType;
                                                             ideDetail.AREA_ID = library?.AREA_ID;
@@ -1354,6 +1355,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                                                 T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL();
                                                                 ideDetail.ORG_ID = filter.OrgId;
                                                                 ideDetail.RISK_IDENTIFY_ID = ide.ID;
+                                                                ideDetail.ENTERPRISE_LIBRARY_ID = library?.ID;
                                                                 ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID;
                                                                 ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType;
                                                                 ideDetail.AREA_ID = library?.AREA_ID;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs

@@ -1292,6 +1292,15 @@ namespace APT.SK.WebApi.Controllers.Api
                         filterValue = value.Value.ToString();
                         item.Rules.Remove(value);
                     }
+                }
+                var rules = pageFilter.FilterGroup.Rules.ToList();
+                foreach (var item in rules)
+                {
+                    if (item.Field == "DEPARTMENT_ID")
+                    {
+                        filterValue = item.Value.ToString();
+                        pageFilter.FilterGroup.Rules.Remove(item);
+                    }
                 }
             }
             if (!string.IsNullOrEmpty(filterValue))

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs

@@ -78,7 +78,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     foreach (var item in details)
                     {
                         var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
-                                 && t.EMERGENCY == item.EMERGENCY);
+                                 && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
                         if (temp == null && item.MARK != SKMarkEnum.Add)
                         {
                             item.MARK = SKMarkEnum.Update;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs

@@ -77,7 +77,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     foreach (var item in details)
                     {
                         var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
-                                 && t.EMERGENCY == item.EMERGENCY);
+                                 && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
                         if (temp == null && item.MARK != SKMarkEnum.Add)
                         {
                             item.MARK = SKMarkEnum.Update;

APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs

@@ -94,7 +94,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     foreach (var item in details)
                     {
                         var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
-                                 && t.EMERGENCY == item.EMERGENCY && t.DEPARTMENT_TYPE == item.DEPARTMENT_TYPE && t.IDENTIFY_DEPARTMENT == item.IDENTIFY_DEPARTMENT && t.IDENTIFY_POST == item.IDENTIFY_POST);
+                                 && t.EMERGENCY == item.EMERGENCY && t.DEPARTMENT_TYPE == item.DEPARTMENT_TYPE && t.IDENTIFY_DEPARTMENT == item.IDENTIFY_DEPARTMENT && t.IDENTIFY_POST == item.IDENTIFY_POST && t.ENABLE_STATUS == item.ENABLE_STATUS);
                         if (temp == null && item.MARK != SKMarkEnum.Add)
                         {
                             item.MARK = SKMarkEnum.Update;