From 0a94a4385899cd672a72473ecdf665d9632d3a34 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 17:30:58 +0800
Subject: [PATCH] 111
---
MES.Service/Modes/SysOrganization.cs | 2
MES.Service/service/BasicData/OrganizeManager.cs | 3
MES.Service/Modes/MesStaff.cs | 164 ++++++++++++++++++++++++++----------------------------
3 files changed, 83 insertions(+), 86 deletions(-)
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 951bc2f..b458632 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -9,154 +9,150 @@
public class MesStaff
{
/// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
+
+ /// <summary>
+ /// ID
+ ///</summary>
+ [SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 鍛樺伐缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "STAFF_NO")]
+ /// 鍛樺伐缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "staff_no")]
public string? StaffNo { get; set; }
/// <summary>
- /// 鍛樺伐濮撳悕
- /// </summary>
- [SugarColumn(ColumnName = "STAFF_NAME")]
+ /// 鍛樺伐濮撳悕
+ ///</summary>
+ [SugarColumn(ColumnName = "staff_name")]
public string? StaffName { get; set; }
/// <summary>
- /// 閮ㄩ棬缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NO")]
+ /// 閮ㄩ棬缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "department_no")]
public string? DepartmentNo { get; set; }
/// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
+ /// 閮ㄩ棬鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "department_name")]
public string? DepartmentName { get; set; }
/// <summary>
- /// 宀椾綅缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_CODE")]
+ /// 宀椾綅缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "position_code")]
public string? PositionCode { get; set; }
/// <summary>
- /// 宀椾綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_NAME")]
+ /// 宀椾綅鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "position_name")]
public string? PositionName { get; set; }
/// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PHONE_NUMBER")]
+ /// 鎵嬫満鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "phone_number")]
public string? PhoneNumber { get; set; }
/// <summary>
- /// 浠诲矖寮�濮嬫棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "START_DATE")]
+ /// 浠诲矖寮�濮嬫棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "start_date")]
public DateTime? StartDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// 澶囨敞
+ ///</summary>
+ [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")]
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
+ [SugarColumn(ColumnName = "remark3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
+ [SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
+ [SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// 鏇存柊浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// 鏇存柊鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "MEMO")]
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "memo")]
public string? Memo { get; set; }
/// <summary>
- /// 鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
+ /// 鐢熶骇绾�
+ ///</summary>
+ [SugarColumn(ColumnName = "line_no")]
public string? LineNo { get; set; }
/// <summary>
- /// 鐢熶骇鍛樺伐鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "WORK_MK")]
- public decimal? WorkMk { get; set; }
+ /// 鐢熶骇鍛樺伐鏍囪瘑
+ /// 榛樿鍊�: ((1))
+ ///</summary>
+ [SugarColumn(ColumnName = "work_mk")]
+ public int? WorkMk { get; set; }
/// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [SugarColumn(ColumnName = "FFORBID_STATUS")]
+ /// 鏄惁绂佺敤
+ ///</summary>
+ [SugarColumn(ColumnName = "fforbid_status")]
public string? FforbidStatus { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </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
diff --git a/MES.Service/Modes/SysOrganization.cs b/MES.Service/Modes/SysOrganization.cs
index d3552b5..c67a3d1 100644
--- a/MES.Service/Modes/SysOrganization.cs
+++ b/MES.Service/Modes/SysOrganization.cs
@@ -53,7 +53,7 @@
/// 宸ュ巶缂栧彿
/// </summary>
[SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
/// 缂栬緫鏃堕棿
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index 76e863d..2add687 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -117,7 +117,8 @@
Name = organize.FName,
FNumber = organize.FNumber,
FParentlD = organize.FParentID,
- IsStatus = organize.FForbidStatus.Equals("A")
+ IsStatus = organize.FForbidStatus.Equals("A"),
+ Factory = organize.Id,
};
}
--
Gitblit v1.9.3