Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

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

@@ -5,16 +5,16 @@ using System.ComponentModel.DataAnnotations;
 namespace Bussiness.Model.Tech
 {
     /// <summary>
-    /// 工艺工位关联设备表
+    /// 工序关联设备表
     /// </summary>
-    public class mes_tech_proc_workshop_equipment : BaseEntity
+    public class mes_tech_proc_equipment : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         [Key]
         [Description("主键")]
-        public long tech_proc_workshop_equip_id { get; set; }
+        public long tech_proc_equip_id { get; set; }
 
         /// <summary>
         /// 设备id
@@ -31,11 +31,11 @@ namespace Bussiness.Model.Tech
         public string? equip_name { get; set; }
 
         /// <summary>
-        /// 工艺工位id
+        /// 工艺工序id
         /// </summary>
         [Required]
-        [Description("工艺工位id")]
-        public long tech_proc_workshop_id { get; set; }
+        [Description("工艺工序id")]
+        public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工作日历id

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

@@ -5,23 +5,23 @@ using System.ComponentModel.DataAnnotations;
 namespace Bussiness.Model.Tech
 {
     /// <summary>
-    /// 发料到工位表
+    /// 发料到工序表
     /// </summary>
-    public class mes_tech_proc_workshop_icitem : BaseEntity
+    public class mes_tech_proc_icitem : BaseEntity
     {
         /// <summary>
         /// 主键
         /// </summary>
         [Key]
         [Description("主键")]
-        public long tech_proc_workshop_icitem_id { get; set; }
+        public long tech_proc_icitem_id { get; set; }
 
         /// <summary>
-        /// 工序工位id
+        /// 工艺工序id
         /// </summary>
         [Required]
-        [Description("工序工位id")]
-        public long tech_proc_workshop_id { get; set; }
+        [Description("工艺工序id")]
+        public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 物料id

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

@@ -7,7 +7,7 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工作日历
     /// </summary>
-    public class work_calendar : BaseEntity
+    public class mes_work_calendar : BaseEntity
     {
         /// <summary>
         /// 工作日历主键

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

@@ -7,7 +7,7 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工作日历明细表
     /// </summary>
-    public class work_calendar_list : BaseEntity
+    public class mes_work_calendar_list : BaseEntity
     {
         /// <summary>
         /// 工作日历明细主键