feat 菜品/菜单配置

Src/Dlhis.Entity/Basic/Entity/BusinessShiftMealRelationshipEntity.cs

@@ -1,6 +1,8 @@
-using Kurisu.Core.DataAccess.Entity;
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.Core.DataAccess.Entity;
 using Kurisu.SqlSugar;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Dlhis.Entity.Basic.Entity;
 
@@ -8,22 +10,22 @@ namespace Dlhis.Entity.Basic.Entity;
 public class BusinessShiftMealRelationshipEntity : SugarBaseEntity, ITenantId
 {
     /// <summary>
-    /// 餐次组合Code
+    /// 餐别Code
     /// </summary>
-    [SugarColumn(ColumnDescription = "餐次组合Code", UniqueGroupNameList = new[] { "idx_CanteenBusinessShiftRelationship_shiftcode_shifttype" })]
+    [SugarColumn(ColumnDescription = "餐别Code", UniqueGroupNameList = new[] { "idx_CanteenBusinessShiftRelationship_shiftcode_shifttype" })]
     public Guid ShiftCode { get; set; }
 
     /// <summary>
-    /// 餐次组合手工号
+    /// 餐别手工号
     /// </summary>
-    [SugarColumn(ColumnDescription = "餐次组合手工号")]
+    [SugarColumn(ColumnDescription = "餐别编码")]
     public string ShiftCustomCode { get; set; }
 
     /// <summary>
     /// 餐次
     /// </summary>
-    [SugarColumn(ColumnDescription = "餐次", UniqueGroupNameList = new[] { "idx_CanteenBusinessShiftRelationship_shiftcode_shifttype" })]
-    public string ShiftType { get; set; }
+    [SugarColumn(ColumnDescription = "餐次", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), UniqueGroupNameList = new[] { "idx_CanteenBusinessShiftRelationship_shiftcode_shifttype" })]
+    public ShiftEnumType ShiftType { get; set; }
 
     /// <summary>
     /// 经营开始时间

Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs

@@ -68,16 +68,16 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
     public Guid? BusinessPlaceCode { get; set; }
 
     /// <summary>
-    /// 餐次
+    /// 餐别
     /// </summary>
-    [SugarColumn(ColumnDescription = "餐次", IsNullable = true)]
+    [SugarColumn(ColumnDescription = "餐别", IsNullable = true)]
     public Guid? BusinessShiftCode { get; set; }
 
     /// <summary>
-    /// 餐次段
+    /// 餐次
     /// </summary>
-    [SugarColumn(ColumnDescription = "餐次段", IsNullable = true)]
-    public string ShiftType { get; set; }
+    [SugarColumn(ColumnDescription = "餐次", ColumnDataType = "varchar(50)", IsNullable = true, SqlParameterDbType = typeof(EnumToStringConvert))]
+    public ShiftEnumType? ShiftType { get; set; }
 
     /// <summary>
     /// 所属成本日期
@@ -89,7 +89,7 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
     /// 消费机器唯一信息
     /// </summary>
     [SugarColumn(ColumnDescription = "消费机器唯一信息", IsNullable = true)]
-    public string DeviceInfo { get; set; }
+    public string DeviceUniqueNo { get; set; }
 
     /// <summary>
     /// 餐补月份

Src/Dlhis.Entity/Canteen/Entities/DishesMenuEntity.cs

@@ -9,14 +9,14 @@ namespace Dlhis.Entity.Canteen.Entities;
 /// <summary>
 /// 菜单表
 /// </summary>
-[SugarTable(TableName = "CanteenMenu", TableDescription = "菜单表")]
-public class CanteenMenuEntity : SugarBaseEntity, ITenantId, IVersion
+[SugarTable(TableName = "DishesMenu", TableDescription = "菜单表")]
+public class DishesMenuEntity : SugarBaseEntity, ITenantId, IVersion
 {
     /// <summary>
-    /// 菜单名称
+    /// 菜单编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "菜单名称")]
-    public string Name { get; set; }
+    [SugarColumn(ColumnDescription = "菜单编码")]
+    public string CustomCode { get; set; }
 
     /// <summary>
     /// 菜单类型
@@ -28,7 +28,7 @@ public class CanteenMenuEntity : SugarBaseEntity, ITenantId, IVersion
     /// 所属营业点
     /// </summary>
     [SugarColumn(ColumnDescription = "所属营业点")]
-    public Guid PlaceCode { get; set; }
+    public Guid BusinessPlaceCode { get; set; }
 
     /// <summary>
     /// 营业日期
@@ -54,6 +54,12 @@ public class CanteenMenuEntity : SugarBaseEntity, ITenantId, IVersion
     /// </summary>
     public int Number { get; set; }
 
+
+    /// <summary>
+    /// 单价
+    /// </summary>
+    public decimal? Price { get; set; }
+
     /// <summary>
     /// 是否启用
     /// </summary>

Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs

@@ -81,7 +81,7 @@ namespace Dlhis.Entity.Canteen.Entities
         /// <summary>
         /// 用餐日期
         /// </summary>
-        [SugarColumn(ColumnDescription = "用餐日期")]
+        [SugarColumn(ColumnDescription = "用餐日期", IsNullable = true)]
         public DateTime UseDate { get; set; }
 
         /// <summary>

Src/Dlhis.Entity/Canteen/Enums/CanteenMenuEnumType.cs

@@ -12,7 +12,7 @@ public enum CanteenMenuEnumType
     /// 订餐
     /// </summary>
     [Description("订餐")]
-    Order = 1,
+    Booking = 1,
 
     /// <summary>
     /// 扫码点餐

Src/Dlhis.Entity/Canteen/Enums/CanteenSettingItemEnumType.cs

@@ -14,6 +14,12 @@ public enum CanteenSettingItemEnumType
     [Description("营业点切换时间(HH:00:00)")]
     BusinessSwitchTime = 100,
 
+    /// <summary>
+    /// 订餐最晚时间
+    /// </summary>
+    [Description("订餐最晚时间(HH:mm:00)")]
+    BookingDeadline = 101,
+
 
     //----------------------------------------------------------------[200,300)--------------------------------------------------------------------------------------