实体调整

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -573,14 +573,14 @@ namespace Business.EntityFrameworkCore
 
             builder.Entity<mes_work_calendar>(b =>
             {
-                b.ToTable("work_calendar").HasComment("工作日历表");
+                b.ToTable("mes_work_calendar").HasComment("工作日历表");
 
                 b.ConfigureByConvention();
             });
 
             builder.Entity<mes_work_calendar_list>(b =>
             {
-                b.ToTable("work_calendar_list").HasComment("工作日历明细表");
+                b.ToTable("mes_work_calendar_list").HasComment("工作日历明细表");
 
                 b.ConfigureByConvention();
             });

MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -8,10 +8,11 @@ using Volo.Abp;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel;
 using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
 
 namespace Business.Model
 {
-    public abstract class BaseEntity:ISoftDelete
+    public abstract class BaseEntity: Entity<long>,ISoftDelete
     {
         /// <summary>
         /// 创建人

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_document.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_tech_proc_document : BaseEntity
     {
-        /// <summary>
-        /// 工序作业指导书主键
-        /// </summary>
-        [Key]
-        [Description("工序作业指导书主键")]
-        public long tech_proc_doc_id { get; set; }
+        ///// <summary>
+        ///// 工序作业指导书主键
+        ///// </summary>
+        //[Key]
+        //[Description("工序作业指导书主键")]
+        //public long tech_proc_doc_id { get; set; }
 
         /// <summary>
         /// 工艺工序主键

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_equipment.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_tech_proc_equipment : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long tech_proc_equip_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("主键")]
+        //public long tech_proc_equip_id { get; set; }
 
         /// <summary>
         /// 设备id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_icitem.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_tech_proc_icitem : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long tech_proc_icitem_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        ////[Key]
+        ////[Description("主键")]
+        ////public long tech_proc_icitem_id { get; set; }
 
         /// <summary>
         /// 工艺工序id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_tech_proc_workshop : BaseEntity
     {
-        /// <summary>
-        /// 工位表主键
-        /// </summary>
-        [Key]
-        [Description("工位表主键")]
-        public long tech_proc_workshop_id { get; set; }
+        ///// <summary>
+        ///// 工位表主键
+        ///// </summary>
+        //[Key]
+        //[Description("工位表主键")]
+        //public long tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 工艺工序id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_staff.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_tech_proc_workshop_staff : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long tech_proc_workshop_equip_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("主键")]
+        //public long tech_proc_workshop_equip_id { get; set; }
 
         /// <summary>
         /// 工艺工位id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -10,12 +10,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_tech_process:BaseEntity
     {
-        /// <summary>
-        /// 工艺工序主键
-        /// </summary>
-        [Key]
-        [Description("工艺工序主键")]
-        public long tech_proc_id { get; set; }
+        ///// <summary>
+        ///// 工艺工序主键
+        ///// </summary>
+        //[Key]
+        //[Description("工艺工序主键")]
+        //public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工艺主键

MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -11,12 +11,12 @@ namespace Bussiness.Model.Tech
     [CollectionName("dopbase", "mes_technique")]
     public class mes_technique : BaseEntity
     {
-        /// <summary>
-        /// 工艺路径主键
-        /// </summary>
-        [Key]
-        [Description("工艺路径主键")]
-        public long tech_id { get; set; }
+        ///// <summary>
+        ///// 工艺路径主键
+        ///// </summary>
+        //[Key]
+        //[Description("工艺路径主键")]
+        //public long tech_id { get; set; }
 
         /// <summary>
         /// 工艺路径名称

MicroServices/Business/Bussiness.Model/Tech/mes_work_calendar.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_work_calendar : BaseEntity
     {
-        /// <summary>
-        /// 工作日历主键
-        /// </summary>
-        [Key]
-        [Description("工作日历主键")]
-        public long work_calendar_id { get; set; }
+        ///// <summary>
+        ///// 工作日历主键
+        ///// </summary>
+        //[Key]
+        //[Description("工作日历主键")]
+        //public long work_calendar_id { get; set; }
 
         /// <summary>
         /// 工作日历编码

MicroServices/Business/Bussiness.Model/Tech/mes_work_calendar_list.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_work_calendar_list : BaseEntity
     {
-        /// <summary>
-        /// 工作日历明细主键
-        /// </summary>
-        [Key]
-        [Description("工作日历明细主键")]
-        public long work_cal_list_id { get; set; }
+        ///// <summary>
+        ///// 工作日历明细主键
+        ///// </summary>
+        //[Key]
+        //[Description("工作日历明细主键")]
+        //public long work_cal_list_id { get; set; }
 
         /// <summary>
         /// 工作日历id

MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_workshop : BaseEntity
     {
-        /// <summary>
-        /// 工位表主键
-        /// </summary>
-        [Key]
-        [Description("工位表主键")]
-        public long workshop_id { get; set; }
+        ///// <summary>
+        ///// 工位表主键
+        ///// </summary>
+        //[Key]
+        //[Description("工位表主键")]
+        //public long workshop_id { get; set; }
 
         /// <summary>
         /// 工位名称

MicroServices/Business/Bussiness.Model/Tech/mes_workshop_shelf.cs

@@ -9,12 +9,12 @@ namespace Bussiness.Model.Tech
     /// </summary>
     public class mes_workshop_shelf : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long workshop_shelf_id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //[Key]
+        //[Description("主键")]
+        //public long workshop_shelf_id { get; set; }
 
         /// <summary>
         /// 工位id