工作日历

BasicData/Tnb.BasicData.Entities/Dto/BasCalendar/CalendarInput.cs

@@ -12,11 +12,13 @@ namespace Tnb.BasicData.Entities.Dto
         public string? datetype { get; set; }
         public string? workhour { get; set; }
         public string? worktype { get; set; }
+        public int? calendartype { get; set;}
+        public string? workgroupid { get; set;}
+        public string? userid { get; set; }
     }
     public class CalendarBatchInput
     {
-        public string? startday { get; set; }
-        public string? endday { get; set; }
+        public string[]? startenday { get; set; }
         public int[]? weekday { get; set; }
         public string? datetype { get; set; }
         public string? workhour { get; set; }

BasicData/Tnb.BasicData.Entities/Dto/BasCalendar/CalendarOut.cs

@@ -18,4 +18,11 @@ namespace Tnb.BasicData.Entities.Dto.BasCalendar
         public string? start { get; set; }
         public string? end { get; set; }
     }
+    public class Shift
+    {
+        public string? startday { get; set; }
+        public string? endday { get; set; }
+        public WorkHour? workhour { get; set; }
+    }
+
 }

BasicData/Tnb.BasicData.Entities/Entity/BasShift.cs

@@ -3,7 +3,6 @@ using JNPF.Common.Security;
 using SqlSugar;
 
 namespace Tnb.BasicData.Entities;
-
 /// <summary>
 /// 班次资料
 /// </summary>

BasicData/Tnb.BasicData.Entities/Entity/BasShiftWorkgroup.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.BasicData.Entities;
+/// <summary>
+/// 班次计划与班组的关联关系
+/// </summary>
+[SugarTable("bas_shift_workgroup")]
+public partial class BasShiftWorkgroup : BaseEntity<string>
+{
+    public BasShiftWorkgroup()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 班次计划id
+    /// </summary>
+    public string shift_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 班组id
+    /// </summary>
+    public string workgroup_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 扩展
+    /// </summary>
+    public string? extras { get; set; }
+
+}
+
+

BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroup.cs

@@ -20,7 +20,7 @@ public partial class BasWorkgroup : BaseEntity<string>
     public string? org_id { get; set; }
 
     /// <summary>
-    /// 班组代码
+    /// 班组编号
     /// </summary>
     public string group_code { get; set; } = string.Empty;
 
@@ -30,7 +30,12 @@ public partial class BasWorkgroup : BaseEntity<string>
     public string group_name { get; set; } = string.Empty;
 
     /// <summary>
-    /// 车间(工段)代码，SEGMENT.SEGMENTCODE
+    /// 班组类型
+    /// </summary>
+    public string? group_type { get; set; }
+
+    /// <summary>
+    /// 所属车间
     /// </summary>
     public string segment_id { get; set; } = string.Empty;
 
@@ -73,5 +78,4 @@ public partial class BasWorkgroup : BaseEntity<string>
     /// 状态
     /// </summary>
     public string? state { get; set; }
-
 }

BasicData/Tnb.BasicData.Entities/Entity/BasWorkgroupEmployee.cs

@@ -27,7 +27,7 @@ public partial class BasWorkgroupEmployee : BaseEntity<string>
     /// <summary>
     /// 班组代码
     /// </summary>
-    public string group_code { get; set; } = string.Empty;
+    public string? group_code { get; set; }
 
     /// <summary>
     /// 人员ID,BAS_EMPLOYEE.ID
@@ -37,36 +37,16 @@ public partial class BasWorkgroupEmployee : BaseEntity<string>
     /// <summary>
     /// 人员代码
     /// </summary>
-    public string employee_code { get; set; } = string.Empty;
+    public string? employee_code { get; set; }
 
     /// <summary>
     /// 是否班组长
     /// </summary>
     public int? is_leader { get; set; }
 
-    /// <summary>
-    /// 创建用户
-    /// </summary>
-    public string? create_id { get; set; }
-
-    /// <summary>
-    /// 创建时间
-    /// </summary>
-    public DateTime create_time { get; set; } = DateTime.Now;
-
-    /// <summary>
-    /// 修改用户
-    /// </summary>
-    public string? modify_id { get; set; }
-
-    /// <summary>
-    /// 修改时间
-    /// </summary>
-    public DateTime? modify_time { get; set; }
-
     /// <summary>
     /// 扩展字段
     /// </summary>
     public string? extras { get; set; }
 
-}
+}

BasicData/Tnb.BasicData.Entities/Enums/EnumCalendarType.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.BasicData.Entities.Enums
+{
+    public enum EnumCalendarType
+    {
+        分类 = 1,
+        班组 = 2,
+        个人 = 3
+    }
+}