班组修改

DOAN.Model/MES/Group/Dto/GroupPersonDto.cs

@@ -0,0 +1,54 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 人员查询对象
+    /// </summary>
+    public class GroupPersonQueryDto : PagerInfo 
+    {
+        public string WorkNum { get; set; }
+
+        public string Name { get; set; }
+
+        public string FkPost { get; set; }
+
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 人员输入输出对象
+    /// </summary>
+    public class GroupPersonDto
+    {
+      
+        public string Id { get; set; }
+
+        [Required(ErrorMessage = "岗位不能为空")]
+        public string FkPost { get; set; }
+        public string PostName { get; set; }
+
+        public string WorkNum { get; set; }
+
+        public string Name { get; set; }
+
+        public DateTime? EmploymentTime { get; set; }
+
+        public DateTime? DepartureTime { get; set; }
+
+        public string Phone { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public string UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Group/Dto/GroupPersonOfSkillDto.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 人员的技能
+    /// </summary>
+    public class GroupPersonOfSkillDto
+    {
+         /// <summary>
+         /// 工位描述
+         /// </summary>
+        public string WorkStationDescription { get; set; }
+        /// <summary>
+        /// 技能id
+        /// </summary>
+        public string FkSkillId { get; set; }
+        /// <summary>
+        /// 技能名称
+        /// </summary>
+
+        public string SkillName { get; set; }
+
+        /// <summary>
+        /// 评分 
+        /// </summary>
+        public int? Score { get; set; }
+
+
+    }
+}

DOAN.Model/MES/Group/Dto/GroupPersonSkillDto.cs

@@ -0,0 +1,90 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 人员技能查询对象
+    /// </summary>
+    public class GroupPersonSkillQueryDto : PagerInfo
+    {
+        public string SkillName { get; set; }
+        public int? Status { get; set; }
+    }
+    public class GroupPersonSkillQueryDto2 : PagerInfo
+    {
+        public string SkillName { get; set; }
+        public int? Status { get; set; }
+        public string person_id { get; set; }
+    }
+    public class GroupPersonSkillQueryDto3 : PagerInfo
+    {
+        public string SkillName { get; set; }
+        public int? Status { get; set; }
+        public int workstation_id { get; set; }
+    }
+
+    //public class GroupPersonSkillQueryDto3 : PagerInfo
+    //{
+    //    public string DictWorkType { get; set; }
+    //    public string WorkStationDescription { get; set; }
+    //}
+
+    /// <summary>
+    /// 人员技能输入输出对象
+    /// </summary>
+    public class GroupPersonSkillDto
+    {
+        [Required(ErrorMessage = "雪花不能为空")]
+        public string Id { get; set; }
+
+        public string SkillName { get; set; }
+
+        public string Image { get; set; }
+
+        public string Vedio { get; set; }
+
+        public string Remark { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+
+    public class GroupPersonSkillDto2
+    {
+        [Required(ErrorMessage = "雪花不能为空")]
+        public string Id { get; set; }
+
+        public string SkillName { get; set; }
+
+        public int score { get; set; }
+
+        public string Image { get; set; }
+
+        public string Vedio { get; set; }
+
+        public string Remark { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Group/Dto/GroupPostDto.cs

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 岗位查询对象
+    /// </summary>
+    public class GroupPostQueryDto : PagerInfo 
+    {
+        public string PostName { get; set; }
+    }
+
+    /// <summary>
+    /// 岗位输入输出对象
+    /// </summary>
+    public class GroupPostDto
+    {
+        [Required(ErrorMessage = "雪花不能为空")]
+        public string Id { get; set; }
+
+        [Required(ErrorMessage = "父id不能为空")]
+        public string ParentId { get; set; }
+
+        public string PostName { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Group/Dto/GroupRelPersonGroupDto.cs

@@ -0,0 +1,34 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 组和员工关联表查询对象
+    /// </summary>
+    public class GroupRelPersonGroupQueryDto : PagerInfo 
+    {
+    }
+
+    /// <summary>
+    /// 组和员工关联表输入输出对象
+    /// </summary>
+    public class GroupRelPersonGroupDto
+    {
+        [Required(ErrorMessage = "组别id不能为空")]
+        public string FkGroupId { get; set; }
+
+        [Required(ErrorMessage = "员工id不能为空")]
+        public string FkPersonId { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

DOAN.Model/MES/Group/Dto/GroupScheduleDto.cs

@@ -0,0 +1,55 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 排班查询对象
+    /// </summary>
+    public class GroupScheduleQueryDto : PagerInfo 
+    {}
+    public class GroupScheduleQueryDto2 : PagerInfo
+    {
+        public DateTime ScheduleDate { get; set; }
+    }
+    public class GroupScheduleQueryDto3 : PagerInfo
+    {
+        public string group_schedule_id { get; set; }
+        public string WorkNum { get; set; }
+
+        public string Name { get; set; }
+
+        public string FkPost { get; set; }
+    }
+
+    /// <summary>
+    /// 排班输入输出对象
+    /// </summary>
+    public class GroupScheduleDto
+    {
+        public string Id { get; set; }
+
+        public DateTime ScheduleDate { get; set; }
+
+        public string GroupName { get; set; }
+
+        public string GroupCode { get; set; }
+
+
+        public int FkShift { get; set; }
+        public string ShiftName { get; set; }
+
+        public string Remark { get; set; }
+
+        public string Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+        public decimal WorkHours { get; set; }
+    }
+}

DOAN.Model/MES/Group/Dto/GroupShiftDto.cs

@@ -0,0 +1,61 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    /// <summary>
+    /// 班次查询对象
+    /// </summary>
+    public class GroupShiftQueryDto : PagerInfo 
+    {}
+
+    /// <summary>
+    /// 班次输入输出对象
+    /// </summary>
+    public class GroupShiftDto
+    {
+        [Required(ErrorMessage = "自增不能为空")]
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        public decimal WorkHours { get; set; }
+        public DateTime? StartTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+    }
+    public class GroupShiftDto2
+    {
+        [Required(ErrorMessage = "自增不能为空")]
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+        public decimal WorkHours { get; set; }
+        public TimeSpan StartTime { get; set; }
+
+        public TimeSpan EndTime { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+    }
+}

DOAN.Model/MES/Group/Dto/HandleSkillInfoDto.cs

@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    public class HandleSkillQueryDto
+    {
+        /// <summary>
+        /// 人员清单
+        /// </summary>
+        public string[] person_id { get; set; }
+        /// <summary>
+        /// 路线id
+        /// </summary>
+        public int Route_id { get; set; }
+
+    }
+    /// <summary>
+    /// 人员技能矩阵
+    /// </summary>
+    public class HandleSkillInfoDto
+    {
+        /// <summary>
+        /// 工艺流程名称
+        /// </summary>
+        public string RouteName { get; set; }
+
+
+
+        /// <summary>
+        /// 工艺流程绑定的工序
+        /// </summary>
+        public List<Columprocesses> colums { get; set; }
+
+
+
+        /// <summary>
+        /// 人员技能列表
+        /// </summary>
+        public List<dynamic> tableList { get; set; }
+
+
+    }
+    /// <summary>
+    /// 工序详情
+    /// </summary>
+    public class Columprocesses
+    {
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        public string processesName { get; set; }
+        /// <summary>
+        /// 工序绑定的工位
+        /// </summary>
+        public List<StationChlidren> children { get; set; }
+
+
+
+    }
+
+    /// <summary>
+    /// 工位
+    /// </summary>
+    public class StationChlidren
+    {
+        /// <summary>
+        /// 工位名称
+        /// </summary>
+        public string stationName { get; set; }
+
+        /// <summary>
+        /// 技能描述
+        /// </summary>
+        public List<Skillschlidren> children { get; set; }
+    }
+
+    /// <summary>
+    /// 技能描述
+    /// </summary>
+    public class Skillschlidren
+    {
+        /// <summary>
+        /// 技能id
+        /// </summary>
+        public string skillId { get; set; }
+        /// <summary>
+        /// 技能名称
+        /// </summary>
+        public string skillName { get; set; }
+    }
+    /// <summary>
+    /// 个人的技能
+    /// </summary>
+    public class PersonOfKillsBase
+    {
+        /// <summary>
+        /// 个人id
+        /// </summary>
+        public string personId { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string workNum { get; set; }
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string postName { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string personName { get; set; }
+
+    }
+
+
+    /// <summary>
+    /// 人员技能增加属性
+    /// </summary>
+    public static class PersonOfKillsExtensions
+    {
+        /// <summary>
+        /// 获取属性
+        /// </summary>
+        /// <param name="person"></param>
+        /// <param name="Property"></param>
+        /// <returns></returns>
+        public static string GetScore(this PersonOfKills person, string Property)
+        {
+            return person.GetType().GetProperty(Property).GetValue(person)?.ToString();
+        }
+        /// <summary>
+        /// 设置属性
+        /// </summary>
+        /// <param name="person"></param>
+        /// <param name="Property"></param>
+        /// <param name="email"></param>
+        public static void SetScore(this PersonOfKills person, string Property, int value)
+        {
+            var propertyInfo = person.GetType().GetProperty(Property);
+            if (propertyInfo != null && propertyInfo.CanWrite)
+            {
+                propertyInfo.SetValue(person, value);
+            }
+        }
+
+
+    }
+    /// <summary>
+    /// 增加属性
+    /// </summary>
+    public class PersonOfKills : PersonOfKillsBase
+    {
+        private readonly Dictionary<string, object> _additionalProperties = new Dictionary<string, object>();
+
+        public object this[string name]
+        {
+            get => _additionalProperties[name];
+            set => _additionalProperties[name] = value;
+
+
+        }
+    }
+}
+
+
+
+
+

DOAN.Model/MES/Group/Dto/SchedulingSituation.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.group.Dto
+{
+    public class SchedulingSituation
+    {
+
+       public string  Date1 {  get; set; }
+       public int  groupNum {  get; set; }
+    }
+}

DOAN.Model/MES/Group/GroupPerson.cs

@@ -0,0 +1,81 @@
+
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 人员
+    /// </summary>
+
+    [SugarTable("group_person")]
+    public class GroupPerson
+    {
+        /// <summary>
+        /// 雪花 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 岗位 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_post")]
+        public string FkPost { get; set; }
+
+        /// <summary>
+        /// 工号 
+        /// </summary>
+        [SugarColumn(ColumnName = "work_num")]
+        public string WorkNum { get; set; }
+
+        /// <summary>
+        /// 名称 
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 入职日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "employment_time")]
+        public DateTime? EmploymentTime { get; set; }
+
+        /// <summary>
+        /// 离职日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "departure_time")]
+        public DateTime? DepartureTime { get; set; }
+
+        /// <summary>
+        /// 手机号 
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 状态（1 在岗 0 不在岗） 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Group/GroupPersonSkill.cs

@@ -0,0 +1,66 @@
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 人员技能
+    /// </summary>
+    [SugarTable("group_person_skill")]
+    public class GroupPersonSkill
+    {
+        /// <summary>
+        /// 雪花 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 技能名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "skill_name")]
+        public string SkillName { get; set; }
+
+        /// <summary>
+        /// 教学图片 
+        /// </summary>
+        public string Image { get; set; }
+
+        /// <summary>
+        /// 教学视频 
+        /// </summary>
+        public string Vedio { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Group/GroupPost.cs

@@ -0,0 +1,63 @@
+
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 岗位
+    /// </summary>
+    [SugarTable("group_post")]
+    public class GroupPost 
+    {
+        /// <summary>
+        /// 雪花 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 父id 
+        /// </summary>
+        [SugarColumn(ColumnName = "parent_id")]
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// 岗位名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "post_name")]
+        public string PostName { get; set; }
+
+        /// <summary>
+        /// 1：启用  0:停用 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Group/GroupRelPersonGroup.cs

@@ -0,0 +1,47 @@
+
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 组和员工关联表
+    /// </summary>
+    [SugarTable("group_rel_person_group")]
+    public class GroupRelPersonGroup
+    {
+        /// <summary>
+        /// 组别id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_group_id")]
+        public string FkGroupId { get; set; }
+
+        /// <summary>
+        /// 员工id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_person_id")]
+        public string FkPersonId { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Group/GroupRelPersonSkill.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 人员与技能关联表
+    /// </summary>
+    [SugarTable("group_rel_person_skill")]
+    public class GroupRelPersonSkill
+    {
+        /// <summary>
+        /// 技能id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_skill_id")]
+        public string FkSkillId { get; set; }
+
+        /// <summary>
+        /// 人员id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_person_id")]
+        public string FkPersonId { get; set; }
+
+        /// <summary>
+        /// 评分 
+        /// </summary>
+        public int? Score { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Group/GroupRelWorkstationSkill.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 工位与技能关联表
+    /// </summary>
+    [SugarTable("group_rel_workstation_skill")]
+    public class GroupRelWorkstationSkill
+    {
+        /// <summary>
+        /// 技能id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_skill_id")]
+        public string FkSkillId { get; set; }
+
+        /// <summary>
+        /// 工位id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_workstation_id")]
+        public int FkWorkstationId { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

DOAN.Model/MES/Group/GroupSchedule.cs

@@ -0,0 +1,75 @@
+
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 排班
+    /// </summary>
+    [SugarTable("group_schedule")]
+    public class GroupSchedule
+    {
+        /// <summary>
+        /// 雪花组id 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 排班日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "schedule_date")]
+        public DateTime? ScheduleDate { get; set; }
+
+        /// <summary>
+        /// 组名 
+        /// </summary>
+        [SugarColumn(ColumnName = "group_name")]
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 组code 
+        /// </summary>
+        [SugarColumn(ColumnName = "group_code")]
+        public string GroupCode { get; set; }
+
+
+        /// <summary>
+        /// 班次 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_shift")]
+        public int FkShift { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态（0 1） 
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+    }
+}

DOAN.Model/MES/Group/GroupShift.cs

@@ -0,0 +1,73 @@
+namespace DOAN.Model.MES.group
+{
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [SugarTable("group_shift")]
+    public class GroupShift
+    {
+        /// <summary>
+        /// 自增 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 名称 
+        /// </summary>
+        public string Name { get; set; }
+
+
+        /// <summary>
+        /// 工时
+        /// </summary>
+        public decimal WorkHours { get; set; }
+
+
+        /// <summary>
+        /// 开始时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "start_time")]
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "end_time")]
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 状态（0 是不启用 1是启用） 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+    }
+}