yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 手动上传,手动设置时间范围

Browse Source
This commit is contained in:
liguoyang
2024-12-19 15:21:45 +08:00
parent e8632b0d49
commit 0f69c56a93
39 changed files with 458 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
View File

@@ -15,138 +15,140 @@ public class BalanceRecordEntity : SugarBaseEntity, ISoftDeleted, ITenantId
/// <summary>
/// 流水号
/// </summary>
[SugarColumn(ColumnDescription = "流水号", UniqueGroupNameList = new[] { "Unique_BalanceRecord_No" })]
[SugarColumn(IsNullable = false, ColumnDescription = "流水号", UniqueGroupNameList = new[] { "Unique_BalanceRecord_No" })]
public string No { get; set; }
/// <summary>
/// 档案号/QRCode
/// </summary>
[SugarColumn(ColumnDescription = "档案号/QRCode")]
[SugarColumn(IsNullable = false, ColumnDescription = "档案号/QRCode")]
public string UserNo { get; set; }
/// <summary>
/// 姓名
/// </summary>
[SugarColumn(ColumnDescription = "姓名")]
[SugarColumn(IsNullable = false, ColumnDescription = "姓名")]
public string Name { get; set; }
/// <summary>
/// 学工号
/// </summary>
[SugarColumn(ColumnDescription = "学工号")]
[SugarColumn(IsNullable = false, ColumnDescription = "学工号")]
public string UserCode { get; set; }
/// <summary>
/// 部门号
/// </summary>
[SugarColumn(ColumnDescription = "部门号")]
[SugarColumn(IsNullable = true, ColumnDescription = "部门号")]
public string DepartmentNo { get; set; }
/// <summary>
/// 来源
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "来源")]
[SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "来源")]
public BalanceRecordSourceEnumType Source { get; set; }
/// <summary>
/// 收入/支出
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "收入/支出")]
[SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "收入/支出")]
public BalanceRecordTypeEnumType Type { get; set; }
/// <summary>
/// 金额 + - 表示
/// </summary>
[SugarColumn(ColumnDescription = "金额+-表示")]
[SugarColumn(IsNullable = false, ColumnDescription = "金额+-表示")]
public decimal Amount { get; set; }
/// <summary>
/// 营业点
/// </summary>
[SugarColumn(ColumnDescription = "营业点", IsNullable = true)]
[SugarColumn(IsNullable = true, ColumnDescription = "营业点")]
public Guid? BusinessPlaceCode { get; set; }
/// <summary>
/// 餐别
/// </summary>
[SugarColumn(ColumnDescription = "餐别", IsNullable = true)]
[SugarColumn(IsNullable = true, ColumnDescription = "餐别")]
public Guid? BusinessShiftCode { get; set; }
/// <summary>
/// 餐次
/// </summary>
[SugarColumn(ColumnDescription = "餐次", ColumnDataType = "varchar(50)", IsNullable = true, SqlParameterDbType = typeof(EnumToStringConvert))]
[SugarColumn(IsNullable = true, ColumnDescription = "餐次", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public ShiftEnumType? ShiftType { get; set; }
/// <summary>
/// 所属成本日期
/// </summary>
[SugarColumn(ColumnDataType = "date", ColumnDescription = "所属成本日期")]
[SugarColumn(IsNullable = false, ColumnDataType = "date", ColumnDescription = "所属成本日期")]
public DateTime CostDate { get; set; }
/// <summary>
/// 消费机器唯一信息
/// </summary>
[SugarColumn(ColumnDescription = "消费机器唯一信息", IsNullable = true)]
[SugarColumn(IsNullable = true, ColumnDescription = "消费机器唯一信息")]
public string DeviceUniqueNo { get; set; }
/// <summary>
/// Ip
/// </summary>
[SugarColumn(ColumnDescription = "IP")]
[SugarColumn(IsNullable = true, ColumnDescription = "IP")]
public string IP { get; set; }
/// <summary>
/// 成本中心
/// </summary>
[SugarColumn(ColumnDescription = "成本中心")]
[SugarColumn(IsNullable = true, ColumnDescription = "成本中心")]
public string CostId { get; set; }
/// <summary>
/// 消费者所在基地
/// </summary>
[SugarColumn(ColumnDescription = "消费者所在基地")]
[SugarColumn(IsNullable = false, ColumnDescription = "消费者所在基地")]
public string OriginTenantId { get; set; }
/// <summary>
/// 成本计算是否允许跨基地范围
/// </summary>
[SugarColumn(ColumnDataType = "bit", ColumnDescription = "成本计算是否允许跨基地范围")]
[SugarColumn(IsNullable = false, ColumnDataType = "bit", ColumnDescription = "成本计算是否允许跨基地范围")]
public bool IsCostCrossTenant { get; set; }
/// <summary>
/// 数据状态
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "数据状态")]
[SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "数据状态")]
public BalanceRecordStatusEnumType Status { get; set; }
/// <summary>
/// 消费时间
/// </summary>
[SugarColumn(ColumnDescription = "消费时间")]
[SugarColumn(IsNullable = false, ColumnDescription = "消费时间")]
public DateTime CostDateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[SugarColumn(ColumnDescription = "备注")]
[SugarColumn(IsNullable = true, ColumnDescription = "备注")]
public string Remark { get; set; }
/// <summary>
/// 餐饮应用类型
/// </summary>
[SugarColumn(ColumnDescription = "餐饮应用类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
[SugarColumn(IsNullable = false, ColumnDescription = "餐饮应用类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public CanteenApplicationTypeEnumType ApplicationType { get; set; }
[SugarColumn(IsNullable = false)]
public string TenantId { get; set; }
/// <summary>
/// 人事范围
/// </summary>
[SugarColumn(IsNullable = true)]
public string Werks { get; set; }
[SugarColumn(ColumnDataType = "bit")]
[SugarColumn(IsNullable = false, ColumnDataType = "bit")]
public bool IsDeleted { get; set; }
}

12
Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs
View File

@@ -13,36 +13,36 @@ public class CanteenOrderEntity : BalanceRecordEntity
/// <summary>
/// 请求json
/// </summary>
[SugarColumn(ColumnDescription = "请求json",ColumnDataType = "varchar(2000)")]
[SugarColumn(IsNullable = true, ColumnDescription = "请求json", ColumnDataType = "varchar(2000)")]
public string RequestJson { get; set; }
/// <summary>
/// 第三方订单号
/// </summary>
[SugarColumn(ColumnDescription = "第三方订单号")]
[SugarColumn(IsNullable = true,ColumnDescription = "第三方订单号")]
public string ThirdNo { get; set; }
/// <summary>
/// 订单状态
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单状态")]
[SugarColumn(IsNullable = false,ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单状态")]
public CanteenOrderStatusEnumType OrderStatus { get; set; }
/// <summary>
/// 是否离线数据
/// </summary>
[SugarColumn(ColumnDataType = "bit", ColumnDescription = "请求json")]
[SugarColumn(IsNullable = false,ColumnDataType = "bit", ColumnDescription = "请求json")]
public bool IsOffline { get; set; }
/// <summary>
/// 配送地址
/// </summary>
[SugarColumn(ColumnDescription = "配送地址")]
[SugarColumn(IsNullable = true,ColumnDescription = "配送地址")]
public string DeliveryAddress { get; set; }
/// <summary>
/// 处理结果
/// </summary>
[SugarColumn(ColumnDescription = "处理结果")]
[SugarColumn(IsNullable = true,ColumnDescription = "处理结果")]
public string Result { get; set; }
}

3
Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs
View File

@@ -16,6 +16,7 @@ public class DishesCategoryEntity : SugarBaseEntity, ITenantId
/// <summary>
/// PCode
/// </summary>
[SugarColumn(IsNullable = true)]
public Guid? PCode { get; set; }
/// <summary>
@@ -38,4 +39,4 @@ public class DishesCategoryEntity : SugarBaseEntity, ITenantId
public string TenantId { get; set; }
}
}

26
Src/Dlhis.Entity/Canteen/Entities/EMealVoucherDetailEntity.cs
View File

@@ -13,70 +13,70 @@ public class EMealVoucherDetailEntity : SugarBaseEntity, IVersion
/// <summary>
/// 主表id
/// </summary>
[SugarColumn(ColumnDescription = "主表id")]
[SugarColumn(IsNullable = false, ColumnDescription = "主表id")]
public long VoucherId { get; set; }
/// <summary>
/// 流水号
/// </summary>
[SugarColumn(ColumnDescription = "流水号", UniqueGroupNameList = new[] { "idx_EMealVoucherDetail_no_idno" })]
[SugarColumn(IsNullable = false, ColumnDescription = "流水号", UniqueGroupNameList = new[] { "idx_EMealVoucherDetail_no_idno" })]
public string No { get; set; }
/// <summary>
/// 人员类型
/// </summary>
[SugarColumn(ColumnDescription = "人员类型(新员工/外来人员)")]
[SugarColumn(IsNullable = false, ColumnDescription = "人员类型(新员工/外来人员)")]
public string UserType { get; set; }
/// <summary>
/// 身份证
/// </summary>
[SugarColumn(ColumnDescription = "证件号", UniqueGroupNameList = new[] { "idx_EMealVoucherDetail_no_idno" })]
[SugarColumn(IsNullable = false, ColumnDescription = "证件号", UniqueGroupNameList = new[] { "idx_EMealVoucherDetail_no_idno" })]
public string IdNo { get; set; }
/// <summary>
/// 用餐人
/// </summary>
[SugarColumn(ColumnDescription = "用餐人")]
[SugarColumn(IsNullable = false, ColumnDescription = "用餐人")]
public string Name { get; set; }
/// <summary>
/// 手机号
/// </summary>
[SugarColumn(ColumnDescription = "手机号")]
[SugarColumn(IsNullable = false, ColumnDescription = "手机号")]
public string Phone { get; set; }
/// <summary>
/// 就餐开始
/// </summary>
[SugarColumn(ColumnDescription = "使用开始", ColumnDataType = "date")]
[SugarColumn(IsNullable = false, ColumnDescription = "使用开始", ColumnDataType = "date")]
public DateTime Start { get; set; }
/// <summary>
/// 就餐结束
/// </summary>
[SugarColumn(ColumnDescription = "使用结束", ColumnDataType = "date")]
[SugarColumn(IsNullable = false, ColumnDescription = "使用结束", ColumnDataType = "date")]
public DateTime End { get; set; }
/// <summary>
/// 金额
/// </summary>
[SugarColumn(ColumnDescription = "余额", ColumnDataType = "decimal(16,2)")]
[SugarColumn(IsNullable = false, ColumnDescription = "余额", ColumnDataType = "decimal(16,2)")]
public decimal Balance { get; set; }
/// <summary>
/// 金额
/// </summary>
[SugarColumn(ColumnDescription = "原始余额", ColumnDataType = "decimal(16,2)")]
[SugarColumn(IsNullable = false, ColumnDescription = "原始余额", ColumnDataType = "decimal(16,2)")]
public decimal OriginBalance { get; set; }
/// <summary>
/// 版本
/// </summary>
[SugarColumn(ColumnDescription = "版本")]
[SugarColumn(IsNullable = false, ColumnDescription = "版本")]
public int Version { get; set; }
[SugarColumn(ColumnDataType = "varchar(255)")]
[SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
public string Signature { get; set; }
}

24
Src/Dlhis.Entity/Canteen/Entities/EMealVoucherEntity.cs
View File

@@ -13,72 +13,72 @@ public class EMealVoucherEntity : SugarBaseEntity
/// <summary>
/// oa流程id
/// </summary>
[SugarColumn(ColumnDescription = "oa流程id", UniqueGroupNameList = new[] { "index_EMealVoucher_No" })]
[SugarColumn(IsNullable = false, ColumnDescription = "oa流程id", UniqueGroupNameList = new[] { "index_EMealVoucher_No" })]
public string No { get; set; }
/// <summary>
/// 标题
/// </summary>
[SugarColumn(ColumnDescription = "标题")]
[SugarColumn(IsNullable = false, ColumnDescription = "标题")]
public string Title { get; set; }
/// <summary>
/// 申请人工号
/// </summary>
[SugarColumn(ColumnDescription = "申请人工号", IndexGroupNameList = new[] { "index_EMealVoucher_Code" })]
[SugarColumn(IsNullable = false, ColumnDescription = "申请人工号", IndexGroupNameList = new[] { "index_EMealVoucher_Code" })]
public string Code { get; set; }
/// <summary>
/// 成本中心
/// </summary>
[SugarColumn(ColumnDescription = "成本中心")]
[SugarColumn(IsNullable = false, ColumnDescription = "成本中心")]
public string CostId { get; set; }
/// <summary>
/// 来宾公司
/// </summary>
[SugarColumn(ColumnDescription = "来宾来源")]
[SugarColumn(IsNullable = false, ColumnDescription = "来宾来源")]
public string Source { get; set; }
/// <summary>
/// 联系人
/// </summary>
[SugarColumn(ColumnDescription = "手机号")]
[SugarColumn(IsNullable = false, ColumnDescription = "手机号")]
public string Phone { get; set; }
/// <summary>
/// 来宾人数
/// </summary>
[SugarColumn(ColumnDescription = "来宾人数")]
[SugarColumn(IsNullable = false, ColumnDescription = "来宾人数")]
public int Number { get; set; }
/// <summary>
/// 就餐事由
/// </summary>
[SugarColumn(ColumnDescription = "申请事由")]
[SugarColumn(IsNullable = false, ColumnDescription = "申请事由")]
public string Reason { get; set; }
/// <summary>
/// 就餐次
/// </summary>
[SugarColumn(ColumnDescription = "就餐次", ColumnDataType = "varchar(500)", IsJson = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "就餐次", ColumnDataType = "varchar(500)", IsJson = true)]
public List<ShiftEnumType> Shifts { get; set; }
/// <summary>
/// 可消费厂区
/// </summary>
[SugarColumn(ColumnDescription = "可消费厂区", ColumnDataType = "varchar(500)", IsJson = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "可消费厂区", ColumnDataType = "varchar(500)", IsJson = true)]
public List<string> Factories { get; set; }
/// <summary>
/// 申请日期
/// </summary>
[SugarColumn(ColumnDescription = "申请日期")]
[SugarColumn(IsNullable = false, ColumnDescription = "申请日期")]
public DateTime Date { get; set; }
/// <summary>
/// 厂区
/// </summary>
[SugarColumn(ColumnDescription = "厂区")]
[SugarColumn(IsNullable = false, ColumnDescription = "厂区")]
public string Factory { get; set; }
}

9
Src/Dlhis.Entity/Canteen/Entities/MealSupplementRecordEntity.cs
View File

@@ -26,23 +26,22 @@ public class MealSupplementRecordEntity : MealSupplementRequestRecordEntity
/// <summary>
/// 餐补状态
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
[SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public MealSupplementStatusEnumtype Status { get; set; }
/// <summary>
/// 处理结果
/// </summary>
[SugarColumn(ColumnDescription = "处理结果", ColumnDataType = "varchar(2000)")]
[SugarColumn(IsNullable = true, ColumnDescription = "处理结果", ColumnDataType = "varchar(2000)")]
public string Result { get; set; }
/// <summary>
/// 状态同步
/// </summary>
[SugarColumn(ColumnDataType = "bit")]
[SugarColumn(IsNullable = false, ColumnDataType = "bit")]
public bool Sync { get; set; }
}
/// <summary>
/// 餐补请求记录
/// </summary>
@@ -78,4 +77,4 @@ public class MealSupplementRequestRecordEntity : SugarBaseEntity
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "餐补")]
public decimal Amount { get; set; }
}
}

3
Src/Dlhis.Entity/Canteen/Entities/UserBalanceEntity.cs
View File

@@ -22,6 +22,7 @@ public class UserBalanceEntity : SugarBaseEntity, IVersion
[SugarColumn(IsNullable = false, ColumnDescription = "余额")]
public decimal Balance { get; set; }
/// <inheritdoc />
[SugarColumn(IsNullable = false)]
public int Version { get; set; }
}