From baa7d3abea49a36b1ca83d29343e720647ee2b8b Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 05 五月 2025 10:29:55 +0800 Subject: [PATCH] 1.生产订单新增同步时间。 2.采购订单新增同步时间。 3.员工新增账号逻辑优化。 4.基础信息+业务单据增加route储存单号。 --- MES.Service/Modes/MesStaff.cs | 77 ++++++++++++++++++-------------------- 1 files changed, 36 insertions(+), 41 deletions(-) diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs index 951bc2f..2d42d2b 100644 --- a/MES.Service/Modes/MesStaff.cs +++ b/MES.Service/Modes/MesStaff.cs @@ -9,154 +9,149 @@ public class MesStaff { /// <summary> + /// 榛樿鍊�: (newid()) + /// </summary> + [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] + public Guid Guid { get; set; } + + /// <summary> /// ID /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + [SugarColumn(ColumnName = "id")] public decimal Id { get; set; } /// <summary> /// 鍛樺伐缂栫爜 /// </summary> - [SugarColumn(ColumnName = "STAFF_NO")] + [SugarColumn(ColumnName = "staff_no")] public string? StaffNo { get; set; } /// <summary> /// 鍛樺伐濮撳悕 /// </summary> - [SugarColumn(ColumnName = "STAFF_NAME")] + [SugarColumn(ColumnName = "staff_name")] public string? StaffName { get; set; } /// <summary> /// 閮ㄩ棬缂栫爜 /// </summary> - [SugarColumn(ColumnName = "DEPARTMENT_NO")] + [SugarColumn(ColumnName = "department_no")] public string? DepartmentNo { get; set; } /// <summary> /// 閮ㄩ棬鍚嶇О /// </summary> - [SugarColumn(ColumnName = "DEPARTMENT_NAME")] + [SugarColumn(ColumnName = "department_name")] public string? DepartmentName { get; set; } /// <summary> /// 宀椾綅缂栫爜 /// </summary> - [SugarColumn(ColumnName = "POSITION_CODE")] + [SugarColumn(ColumnName = "position_code")] public string? PositionCode { get; set; } /// <summary> /// 宀椾綅鍚嶇О /// </summary> - [SugarColumn(ColumnName = "POSITION_NAME")] + [SugarColumn(ColumnName = "position_name")] public string? PositionName { get; set; } /// <summary> /// 鎵嬫満鍙� /// </summary> - [SugarColumn(ColumnName = "PHONE_NUMBER")] + [SugarColumn(ColumnName = "phone_number")] public string? PhoneNumber { get; set; } /// <summary> /// 浠诲矖寮�濮嬫棩鏈� /// </summary> - [SugarColumn(ColumnName = "START_DATE")] + [SugarColumn(ColumnName = "start_date")] public DateTime? StartDate { get; set; } /// <summary> /// 澶囨敞 /// </summary> - [SugarColumn(ColumnName = "REMARK")] + [SugarColumn(ColumnName = "remark")] public string? Remark { get; set; } - - /// <summary> - /// 鑷畾涔夊瓧娈�1 - /// </summary> - [SugarColumn(ColumnName = "REMARK1")] - public string? Remark1 { get; set; } - - /// <summary> - /// 鑷畾涔夊瓧娈�2 - /// </summary> - [SugarColumn(ColumnName = "REMARK2")] - public string? Remark2 { get; set; } /// <summary> /// 鑷畾涔夊瓧娈�3 /// </summary> - [SugarColumn(ColumnName = "REMARK3")] + [SugarColumn(ColumnName = "remark3")] public string? Remark3 { get; set; } /// <summary> /// 鑷畾涔夊瓧娈�4 /// </summary> - [SugarColumn(ColumnName = "REMARK4")] + [SugarColumn(ColumnName = "remark4")] public string? Remark4 { get; set; } /// <summary> /// 鑷畾涔夊瓧娈�5 /// </summary> - [SugarColumn(ColumnName = "REMARK5")] + [SugarColumn(ColumnName = "remark5")] public string? Remark5 { get; set; } /// <summary> /// 鍒涘缓浜� /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + [SugarColumn(ColumnName = "create_by")] public string? CreateBy { get; set; } /// <summary> /// 鍒涘缓鏃堕棿 /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + [SugarColumn(ColumnName = "create_date")] public DateTime? CreateDate { get; set; } /// <summary> /// 鏇存柊浜� /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + [SugarColumn(ColumnName = "lastupdate_by")] public string? LastupdateBy { get; set; } /// <summary> /// 鏇存柊鏃堕棿 /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + [SugarColumn(ColumnName = "lastupdate_date")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 澶囨敞 /// </summary> - [SugarColumn(ColumnName = "MEMO")] + [SugarColumn(ColumnName = "memo")] public string? Memo { get; set; } /// <summary> /// 鐢熶骇绾� /// </summary> - [SugarColumn(ColumnName = "LINE_NO")] + [SugarColumn(ColumnName = "line_no")] public string? LineNo { get; set; } /// <summary> /// 鐢熶骇鍛樺伐鏍囪瘑 + /// 榛樿鍊�: ((1)) /// </summary> - [SugarColumn(ColumnName = "WORK_MK")] - public decimal? WorkMk { get; set; } + [SugarColumn(ColumnName = "work_mk")] + public int? WorkMk { get; set; } /// <summary> /// 鏄惁绂佺敤 /// </summary> - [SugarColumn(ColumnName = "FFORBID_STATUS")] + [SugarColumn(ColumnName = "fforbid_status")] public string? FforbidStatus { get; set; } /// <summary> - /// 浣跨敤绲勭箶 - /// </summary> - [SugarColumn(ColumnName = "FSubsidiary")] - public string? FSubsidiary { get; set; } - - /// <summary> - /// 鍓靛缓绲勭箶 + /// 鍒涘缓缁勭粐 /// </summary> [SugarColumn(ColumnName = "Fumbrella")] public string? Fumbrella { get; set; } + /// <summary> + /// 浣跨敤缁勭粐 + /// </summary> + [SugarColumn(ColumnName = "FSubsidiary")] + public string? FSubsidiary { get; set; } + [SugarColumn(IsIgnore = true)] public string? Type { get; set; } } \ No newline at end of file -- Gitblit v1.9.3