接口调整

啊鑫

2024-10-23 729c87c230c6afcd698ead19732420a3195d58ad

接口调整

 MES.Service/Dto/webApi/ErpStaff.cs

@@ -7,11 +7,11 @@
    public string? FStaffNumber { get; set; }
    public string? FName { get; set; }
    public string? FPostDept { get; set; }
    public string? FPost { get; set; }
    public string? FPostId { get; set; }
    public string? FMobile { get; set; }
    public string? FStaffStartDate { get; set; }
    public string? FDescription { get; set; }
    public string? FForbidStatus { get; set; }
    public string? FCREATEORGID { get; set; }
    public string? FUSEORGID { get; set; }
    public string? FCreateOrgId { get; set; }
    public string? FUseOrgId { get; set; }
}

 MES.Service/Modes/MesDepots.cs

@@ -9,87 +9,191 @@
public class MesDepots
{
    /// <summary>
    ///     ID(SEQ_INV_ID)
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_ID", IsPrimaryKey = true)]
    ///  
    /// é»˜è®¤å€¼: (newid())
    ///</summary>
    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
    public Guid Guid { get; set; }

    /// <summary>
    /// ID(SEQ_INV_ID) 
    ///</summary>
    [SugarColumn(ColumnName = "depot_id")]
    public decimal DepotId { get; set; }

    /// <summary>
    ///     ä»“库类别编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    /// ä»“库类别编码 
    ///</summary>
    [SugarColumn(ColumnName = "depot_code")]
    public string? DepotCode { get; set; }

    /// <summary>
    ///     ä»“库类别名称
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_NAME")]
    /// ä»“库类别名称 
    ///</summary>
    [SugarColumn(ColumnName = "depot_name")]
    public string? DepotName { get; set; }

    /// <summary>
    /// å¤‡æ³¨ 
    ///</summary>
    [SugarColumn(ColumnName = "description")]
    public string? Description { 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 = "DEPOTTYPE")]
    /// ä»“库类型 
    ///</summary>
    [SugarColumn(ColumnName = "depottype")]
    public string? Depottype { get; set; }

    /// <summary>
    ///     åˆ†åŽ‚编码
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    /// åˆ†åŽ‚编码 
    ///</summary>
    [SugarColumn(ColumnName = "factory")]
    public string? Factory { get; set; }

    /// <summary>
    /// ç‰©æ–™ä½¿ç”¨ 
    /// é»˜è®¤å€¼: ((0))
    ///</summary>
    [SugarColumn(ColumnName = "type_1")]
    public int? Type1 { get; set; }

    /// <summary>
    ///     å…¬å¸ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    /// æˆå“ä½¿ç”¨ 
    /// é»˜è®¤å€¼: ((0))
    ///</summary>
    [SugarColumn(ColumnName = "type_2")]
    public int? Type2 { get; set; }

    /// <summary>
    /// ä»“库类型编码 
    ///</summary>
    [SugarColumn(ColumnName = "depottypecode")]
    public int? Depottypecode { get; set; }

    /// <summary>
    /// å…¬å¸ä»£ç  
    ///</summary>
    [SugarColumn(ColumnName = "company")]
    public string? Company { get; set; }

    /// <summary>
    /// çœ‹æ¿å›¾æ ‡æ ·å¼ 
    ///</summary>
    [SugarColumn(ColumnName = "icon_type")]
    public int? IconType { get; set; }

    /// <summary>
    ///     æ˜¯å¦ä¸è‰¯å“ä»“
    /// </summary>
    [SugarColumn(ColumnName = "IS_NG")]
    /// æ˜¯å¦å§”外仓库 
    /// é»˜è®¤å€¼: ((0))
    ///</summary>
    [SugarColumn(ColumnName = "is_wy")]
    public int? IsWy { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¸è‰¯å“ä»“ 
    /// é»˜è®¤å€¼: ((0))
    ///</summary>
    [SugarColumn(ColumnName = "is_ng")]
    public string? IsNg { get; set; }

    /// <summary>
    /// ä»“库地址 
    ///</summary>
    [SugarColumn(ColumnName = "cwhaddress")]
    public string? Cwhaddress { get; set; }

    /// <summary>
    ///     ä»“位组ID
    /// </summary>
    [SugarColumn(ColumnName = "ZUID")]
    /// çœ‹æ¿æ˜¾ç¤ºåŒºåŸŸç¼–号 
    /// é»˜è®¤å€¼: ((1))
    ///</summary>
    [SugarColumn(ColumnName = "pi_type")]
    public string? PiType { get; set; }

    /// <summary>
    /// åˆ†ç»„ 
    ///</summary>
    [SugarColumn(ColumnName = "zuid")]
    public string? Zuid { get; set; }

    /// <summary>
    ///     å…è®¸å³æ—¶åº“存负库存
    /// </summary>
    [SugarColumn(ColumnName = "IS_FKC")]
    /// å…è®¸å³æ—¶åº“存负库存 
    ///</summary>
    [SugarColumn(ColumnName = "is_fkc")]
    public string? IsFkc { get; set; }

    /// <summary>
    /// ç”Ÿäº§è½¦é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "production_workshop")]
    public string? ProductionWorkshop { get; set; }

    /// <summary>
    /// ç‰©æ–™å±žæ€§ 
    ///</summary>
    [SugarColumn(ColumnName = "material_properti")]
    public string? MaterialProperti { get; set; }
    
    /// <summary>
    /// è‡ªå®šä¹‰å­—段3 
    ///</summary>
    [SugarColumn(ColumnName = "remark3")]
    public string? Remark3 { get; set; }

    /// <summary>
    /// è‡ªå®šä¹‰å­—段4 
    ///</summary>
    [SugarColumn(ColumnName = "remark4")]
    public string? Remark4 { get; set; }

    /// <summary>
    /// è‡ªå®šä¹‰å­—段5 
    ///</summary>
    [SugarColumn(ColumnName = "remark5")]
    public string? Remark5 { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "check_date")]
    public DateTime? CheckDate { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "check_by")]
    public string? CheckBy { get; set; }

    /// <summary>
    ///  
    /// é»˜è®¤å€¼: ((0))
    ///</summary>
    [SugarColumn(ColumnName = "check_status")]
    public bool? CheckStatus { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”

 MES.Service/Modes/MesPosition.cs

@@ -9,56 +9,87 @@
public class MesPosition
{
    /// <summary>
    ///     é»˜è®¤å€¼: (newid())
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
    public Guid Guid { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "id")]
    public decimal Id { get; set; }

    /// <summary>
    ///     å²—位编号
    /// </summary>
    [SugarColumn(ColumnName = "POSITION_ID")]
    [SugarColumn(ColumnName = "position_id")]
    public string? PositionId { get; set; }

    /// <summary>
    ///     å²—位名称
    /// </summary>
    [SugarColumn(ColumnName = "POSITION_NAME")]
    [SugarColumn(ColumnName = "position_name")]
    public string? PositionName { get; set; }

    /// <summary>
    ///     å²—位描述
    /// </summary>
    [SugarColumn(ColumnName = "POSITION_DESCRIPTION")]
    [SugarColumn(ColumnName = "position_description")]
    public string? PositionDescription { get; set; }

    /// <summary>
    ///     æ‰€å±žéƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT")]
    [SugarColumn(ColumnName = "department")]
    public string? Department { get; set; }

    /// <summary>
    ///     å»ºç«‹æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "CREATION_DATE")]
    [SugarColumn(ColumnName = "creation_date")]
    public DateTime? CreationDate { get; set; }

    /// <summary>
    ///     ç¦ç”¨äºº
    /// </summary>
    [SugarColumn(ColumnName = "DISABLED_BY")]
    [SugarColumn(ColumnName = "disabled_by")]
    public string? DisabledBy { get; set; }

    /// <summary>
    ///     ç¦ç”¨æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "DISABLED_DATE")]
    [SugarColumn(ColumnName = "disabled_date")]
    public DateTime? DisabledDate { get; set; }

    /// <summary>
    ///     ç¦ç”¨çŠ¶æ€  A å¯ç”¨ B禁用
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDSTATUS")]
    [SugarColumn(ColumnName = "remark1")]
    public string? Remark1 { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "remark2")]
    public string? Remark2 { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "remark3")]
    public string? Remark3 { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "remark4")]
    public string? Remark4 { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "remark5")]
    public string? Remark5 { get; set; }

    /// <summary>
    ///     ç¦ç”¨çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "fforbidstatus")]
    public string? Fforbidstatus { get; set; }

    /// <summary>

 MES.Service/Modes/MesStaff.cs

@@ -18,43 +18,43 @@
    ///     å‘˜å·¥ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "STAFF_NO")]
    public string StaffNo { get; set; }
    public string? StaffNo { get; set; }

    /// <summary>
    ///     å‘˜å·¥å§“名
    /// </summary>
    [SugarColumn(ColumnName = "STAFF_NAME")]
    public string StaffName { get; set; }
    public string? StaffName { get; set; }

    /// <summary>
    ///     éƒ¨é—¨ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT_NO")]
    public string DepartmentNo { get; set; }
    public string? DepartmentNo { get; set; }

    /// <summary>
    ///     éƒ¨é—¨åç§°
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
    public string DepartmentName { get; set; }
    public string? DepartmentName { get; set; }

    /// <summary>
    ///     å²—位编码
    /// </summary>
    [SugarColumn(ColumnName = "POSITION_CODE")]
    public string PositionCode { get; set; }
    public string? PositionCode { get; set; }

    /// <summary>
    ///     å²—位名称
    /// </summary>
    [SugarColumn(ColumnName = "POSITION_NAME")]
    public string PositionName { get; set; }
    public string? PositionName { get; set; }

    /// <summary>
    ///     æ‰‹æœºå·
    /// </summary>
    [SugarColumn(ColumnName = "PHONE_NUMBER")]
    public string PhoneNumber { get; set; }
    public string? PhoneNumber { get; set; }

    /// <summary>
    ///     ä»»å²—开始日期
@@ -66,43 +66,43 @@
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string Remark { get; set; }
    public string? Remark { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string Remark1 { get; set; }
    public string? Remark1 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string Remark2 { get; set; }
    public string? Remark2 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string Remark3 { get; set; }
    public string? Remark3 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string Remark4 { get; set; }
    public string? Remark4 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string Remark5 { get; set; }
    public string? Remark5 { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string CreateBy { get; set; }
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
@@ -114,7 +114,7 @@
    ///     æ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string LastupdateBy { get; set; }
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     æ›´æ–°æ—¶é—´
@@ -126,13 +126,13 @@
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "MEMO")]
    public string Memo { get; set; }
    public string? Memo { get; set; }

    /// <summary>
    ///     ç”Ÿäº§çº¿
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NO")]
    public string LineNo { get; set; }
    public string? LineNo { get; set; }

    /// <summary>
    ///     ç”Ÿäº§å‘˜å·¥æ ‡è¯†
@@ -144,9 +144,7 @@
    ///     æ˜¯å¦ç¦ç”¨
    /// </summary>
    [SugarColumn(ColumnName = "FFORBID_STATUS")]
    public string FforbidStatus { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
    public string? FforbidStatus { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
@@ -159,4 +157,6 @@
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}

 MES.Service/Modes/Organize.cs

@@ -15,38 +15,38 @@
    /// ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "FNUMBER")]
    public string Fnumber { get; set; }
    public string? Fnumber { get; set; }

    /// <summary>
    /// åç§° 
    ///</summary>
    [SugarColumn(ColumnName = "FNAME")]
    public string Fname { get; set; }
    public string? Fname { get; set; }

    /// <summary>
    ///  
    ///</summary>
    // [SugarColumn(ColumnName="ID"    )]
    [SugarColumn(IsPrimaryKey = true)]
    public string Id { get; set; }
    public string? Id { get; set; }

    /// <summary>
    /// ç¦ç”¨çŠ¶æ€ A å¯ç”¨ B禁用
    ///</summary>
    [SugarColumn(ColumnName = "Fforbidstatus")]
    public string Fforbidstatus { get; set; }
    public string? Fforbidstatus { get; set; }

    /// <summary>
    /// æ“ä½œç±»åž‹ 
    ///</summary>
    [SugarColumn(ColumnName = "TYPE")]
    public string Type { get; set; }
    public string? Type { get; set; }

    /// <summary>
    /// ç»„织描述 
    ///</summary>
    [SugarColumn(ColumnName = "FDESCRIPTION")]
    public string FDescription { get; set; }
    public string? FDescription { get; set; }

    /// <summary>
    /// ä¸Šçº§ç»„织 

 MES.Service/Modes/SysDepartment.cs

@@ -9,88 +9,152 @@
public class SysDepartment
{
    /// <summary>
    ///     å…¬å¸
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }
    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
    public Guid Guid { get; set; }

    /// <summary>
    ///     å·¥åŽ‚
    ///     å…¬å¸
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
    [SugarColumn(ColumnName = "company")]
    public string? Company { get; set; }

    /// <summary>
    ///     éƒ¨é—¨ID
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENTID")]
    [SugarColumn(ColumnName = "departmentid")]
    public decimal? Departmentid { get; set; }

    /// <summary>
    ///     éƒ¨é—¨ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENTCODE")]
    [SugarColumn(ColumnName = "departmentcode")]
    public string? Departmentcode { get; set; }

    /// <summary>
    ///     éƒ¨é—¨åç§°
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENTNAME")]
    [SugarColumn(ColumnName = "departmentname")]
    public string? Departmentname { get; set; }

    /// <summary>
    ///     éƒ¨é—¨å±žæ€§
    /// </summary>
    [SugarColumn(ColumnName = "DEPEXTR1")]
    [SugarColumn(ColumnName = "depextr1")]
    public string? Depextr1 { get; set; }

    /// <summary>
    ///     éƒ¨é—¨åˆ†ç»„
    /// </summary>
    [SugarColumn(ColumnName = "DEPEXTR2")]
    [SugarColumn(ColumnName = "depextr2")]
    public string? Depextr2 { get; set; }

    /// <summary>
    ///     WIP仓库
    /// </summary>
    [SugarColumn(ColumnName = "DEPEXTR3")]
    [SugarColumn(ColumnName = "depextr3")]
    public string? Depextr3 { get; set; }

    /// <summary>
    ///     æ˜¯å¦ç¦ç”¨
    ///     æ˜¯å¦ç¦ç”¨ A å¯ç”¨ B禁用
    /// </summary>
    [SugarColumn(ColumnName = "DEPEXTR4")]
    [SugarColumn(ColumnName = "depextr4")]
    public string? Depextr4 { get; set; }

    /// <summary>
    ///     éƒ¨é—¨æ‰©å±•å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "depextr5")]
    public string? Depextr5 { get; set; }

    /// <summary>
    ///     è½¦é—´ID
    /// </summary>
    [SugarColumn(ColumnName = "workshop_no")]
    public string? WorkshopNo { get; set; }

    /// <summary>
    ///     è½¦é—´å
    /// </summary>
    [SugarColumn(ColumnName = "workshop_name")]
    public string? WorkshopName { get; set; }

    /// <summary>
    ///     éƒ¨é—¨ç»ç†
    /// </summary>
    [SugarColumn(ColumnName = "fmanager")]
    public string? Fmanager { get; set; }

    /// <summary>
    ///     å·¥åŽ‚
    /// </summary>
    [SugarColumn(ColumnName = "factory")]
    public string? Factory { 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 = "remark")]
    public string? Remark { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "id")]
    public decimal Id { get; set; }

    /// <summary>
    ///     ç”Ÿäº§è½¦é—´
    /// </summary>
    [SugarColumn(ColumnName = "production_workshop")]
    public string? ProductionWorkshop { get; set; }

    /// <summary>
    ///     ç‰©æ–™å±žæ€§
    /// </summary>
    [SugarColumn(ColumnName = "material_properti")]
    public string? MaterialProperti { get; set; }

    /// <summary>
    ///     ä¸Šçº§éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "FParentID")]
    public string? FParentID { get; set; }
    [SugarColumn(ColumnName = "parent_id")]
    public int? ParentId { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "remark4")]
    public string? Remark4 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "remark5")]
    public string? Remark5 { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
@@ -105,9 +169,10 @@
    public string? Fumbrella { get; set; }

    /// <summary>
    ///     ä¸Šçº§éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    [SugarColumn(ColumnName = "FParentID")]
    public string? FParentID { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}

 MES.Service/Modes/SysOrganization.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
using SqlSugar;

namespace MES.Service.Modes;

/// <summary>
/// </summary>
[SugarTable("SYS_ORGANIZATION")]
public class SysOrganization
{
    /// <summary>
    ///     ä¸»é”®
    /// </summary>
    [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)]
    public Guid Guid { get; set; }

    /// <summary>
    ///     çˆ¶çº§guid
    /// </summary>
    [SugarColumn(ColumnName = "UP_GUID")]
    public Guid? UpGuid { get; set; }

    /// <summary>
    ///     åç§°
    /// </summary>
    [SugarColumn(ColumnName = "NAME")]
    public string? Name { get; set; }

    /// <summary>
    ///     è”系人
    /// </summary>
    [SugarColumn(ColumnName = "CON_PEOPLE")]
    public string? ConPeople { get; set; }

    /// <summary>
    ///     è”系电话
    /// </summary>
    [SugarColumn(ColumnName = "CON_TEL")]
    public string? ConTel { get; set; }

    /// <summary>
    ///     ç³»ç»Ÿå†…ç½®
    /// </summary>
    [SugarColumn(ColumnName = "IS_SYS")]
    public int? IsSys { get; set; }

    /// <summary>
    ///     çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "IS_STATUS")]
    public bool? IsStatus { get; set; }

    /// <summary>
    ///     å·¥åŽ‚编号
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }

    /// <summary>
    ///     ç¼–辑时间
    /// </summary>
    [SugarColumn(ColumnName = "EDT_TIME")]
    public DateTime? EdtTime { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "check_date")]
    public DateTime? CheckDate { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "check_by")]
    public string? CheckBy { get; set; }

    /// <summary>
    ///     é»˜è®¤å€¼: ((0))
    /// </summary>
    [SugarColumn(ColumnName = "check_status")]
    public bool? CheckStatus { get; set; }

    /// <summary>
    ///     ç»„织ID
    /// </summary>
    [SugarColumn(ColumnName = "FNumber")]
    public string? FNumber { get; set; }

    /// <summary>
    ///     çˆ¶çº§ID
    /// </summary>
    [SugarColumn(ColumnName = "FParentlD")]
    public string? FParentlD { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}

 MES.Service/Modes/SysUser.cs

@@ -1,347 +1,125 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

namespace MES.Service.Modes;

/// <summary>
/// </summary>
[Table("SYS_USER")]
[SugarTable("SYS_USER")] //用于SqlSugar
[SugarTable("SYS_USER")]
public class SysUser
{
    /// <summary>
    ///     BASEINFO
    ///     ä¸»é”®
    /// </summary>
    [Key]
    [Column("FID")]
    [StringLength(20, ErrorMessage = "Fid长度不能超出20")]
    [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "BASEINFO",
        ColumnName = "FID")] //用于SqlSugar
    public string Fid { get; set; }


    [StringLength(20, ErrorMessage = "Sid长度不能超出20")]
    [SugarColumn(ColumnName = "SID")] //用于SqlSugar
    public decimal Sid { get; set; }
    [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)]
    public Guid Guid { get; set; }

    /// <summary>
    ///     æŽ¥æ”¶ç‰©æ–™æ˜¯å¦è¿›è¡Œæ£€æŸ¥
    ///     è´¦å·
    /// </summary>
    [Column("CHECK_FLAG")]
    [SugarColumn(ColumnName = "CHECK_FLAG")] //用于SqlSugar
    public decimal? CheckFlag { get; set; }
    [SugarColumn(ColumnName = "ACCOUNT")]
    public string? Account { get; set; }

    /// <summary>
    ///     å¯†ç 
    /// </summary>
    [Column("COMPANY")]
    [SugarColumn(ColumnName = "COMPANY")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Company长度不能超出20")]
    public string Company { get; set; }
    [SugarColumn(ColumnName = "PASSWORD")]
    public string? Password { get; set; }

    /// <summary>
    ///     ç”¨æˆ·å§“名
    /// </summary>
    [Column("CREATE_BY")]
    [SugarColumn(ColumnName = "CREATE_BY")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "CreateBy长度不能超出20")]
    public string CreateBy { get; set; }
    [SugarColumn(ColumnName = "USER_NAME")]
    public string? UserName { get; set; }

    /// <summary>
    ///     ä½å€
    /// </summary>
    [Column("CREATE_DATE")]
    [SugarColumn(ColumnName = "CREATE_DATE")] //用于SqlSugar
    public DateTime? CreateDate { get; set; }
    [SugarColumn(ColumnName = "ADDRESS")]
    public string? Address { get; set; }

    /// <summary>
    ///     æ˜¯å¦æœ‰åˆ é™¤ç‰¹æƒ
    ///     ç”µè¯
    /// </summary>
    [Column("DEL_FLAG")]
    [SugarColumn(ColumnName = "DEL_FLAG")] //用于SqlSugar
    public decimal? DelFlag { get; set; }
    [SugarColumn(ColumnName = "TEL")]
    public string? Tel { get; set; }

    /// <summary>
    ///     éƒ¨é—¨
    ///     é‚®ç®±
    /// </summary>
    [Column("DEPARTMENTID")]
    [SugarColumn(ColumnName = "DEPARTMENTID")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "部门长度不能超出20")]
    public string Departmentid { get; set; }
    [SugarColumn(ColumnName = "EMAIL")]
    public string? Email { get; set; }

    /// <summary>
    ///     æœ€åŽç™»å½•æ—¶é—´
    /// </summary>
    [Column("DEV")]
    [SugarColumn(ColumnName = "DEV")] //用于SqlSugar
    public decimal? Dev { get; set; }
    [SugarColumn(ColumnName = "LASTLOGIN_TIME")]
    public DateTime? LastloginTime { get; set; }

    /// <summary>
    ///     æœ€åŽé€€å‡ºæ—¶é—´
    /// </summary>
    [Column("EXP_FIEL10")]
    [SugarColumn(ColumnName = "EXP_FIEL10")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "ExpFiel10长度不能超出50")]
    public string ExpFiel10 { get; set; }
    [SugarColumn(ColumnName = "LASTLOGOUT_TIME")]
    public DateTime? LastlogoutTime { get; set; }

    /// <summary>
    ///     çŠ¶æ€
    /// </summary>
    [Column("EXP_FIEL11")]
    [SugarColumn(ColumnName = "EXP_FIEL11")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "ExpFiel11长度不能超出50")]
    public string ExpFiel11 { get; set; }
    [SugarColumn(ColumnName = "IS_STATUS")]
    public bool? IsStatus { get; set; }

    /// <summary>
    ///     å»ºç«‹è€…
    /// </summary>
    [Column("EXP_FIEL12")]
    [SugarColumn(ColumnName = "EXP_FIEL12")] //用于SqlSugar
    public decimal? ExpFiel12 { get; set; }
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     ç­æ¬¡
    ///     å»ºç«‹æ—¶é—´
    /// </summary>
    [Column("EXP_FIELD1")]
    [SugarColumn(ColumnName = "EXP_FIELD1")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "班次长度不能超出20")]
    public string ExpField1 { get; set; }
    [SugarColumn(ColumnName = "CREATE_TIME")]
    public DateTime? CreateTime { get; set; }

    /// <summary>
    ///     çº¿ä½“
    ///     æ›´æ–°æ—¶é—´
    /// </summary>
    [Column("EXP_FIELD2")]
    [SugarColumn(ColumnName = "EXP_FIELD2")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "线体长度不能超出20")]
    public string ExpField2 { get; set; }
    [SugarColumn(ColumnName = "LASTUPDATE_TIME")]
    public DateTime? LastupdateTime { get; set; }

    /// <summary>
    ///     ç…§ç‰‡
    ///     æ›´æ–°äºº
    /// </summary>
    [Column("EXP_FIELD3")]
    [SugarColumn(ColumnName = "EXP_FIELD3")] //用于SqlSugar
    public byte[] ExpField3 { get; set; }
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     è”系方式
    ///     æ˜¯å¦åœ¨çº¿
    /// </summary>
    [Column("EXP_FIELD4")]
    [SugarColumn(ColumnName = "EXP_FIELD4")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "联系方式长度不能超出20")]
    public string ExpField4 { get; set; }
    [SugarColumn(ColumnName = "FLAG_ONLINE")]
    public int? FlagOnline { get; set; }

    /// <summary>
    ///     å›¾ç‰‡å
    ///     ç™»å½•æ¬¡æ•°
    /// </summary>
    [Column("EXP_FIELD5")]
    [SugarColumn(ColumnName = "EXP_FIELD5")] //用于SqlSugar
    [StringLength(200, ErrorMessage = "图片名长度不能超出200")]
    public string ExpField5 { get; set; }
    [SugarColumn(ColumnName = "LOGIN_COUNTER")]
    public int? LoginCounter { get; set; }

    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [Column("EXP_FIELD6")]
    [SugarColumn(ColumnName = "EXP_FIELD6")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "ExpField6长度不能超出20")]
    public string ExpField6 { get; set; }
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }

    /// <summary>
    ///     è½¦é—´ç¼–码
    ///     éƒ¨é—¨ç¼–号
    /// </summary>
    [Column("EXP_FIELD7")]
    [SugarColumn(ColumnName = "EXP_FIELD7")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "车间编码长度不能超出50")]
    public string ExpField7 { get; set; }
    [SugarColumn(ColumnName = "DEPART_NO")]
    public string? DepartNo { get; set; }

    /// <summary>
    ///     æ˜¯å¦ç³»ç»Ÿå†…ç½®
    /// </summary>
    [Column("EXP_FIELD8")]
    [SugarColumn(ColumnName = "EXP_FIELD8")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "ExpField8长度不能超出50")]
    public string ExpField8 { get; set; }

    /// <summary>
    /// </summary>
    [Column("EXP_FIELD9")]
    [SugarColumn(ColumnName = "EXP_FIELD9")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "ExpField9长度不能超出50")]
    public string ExpField9 { get; set; }

    /// <summary>
    ///     å·¥åŽ‚
    /// </summary>
    [Column("FACTORY")]
    [SugarColumn(ColumnName = "FACTORY")] //用于SqlSugar
    [StringLength(1000, ErrorMessage = "工厂长度不能超出1000")]
    public string Factory { get; set; }

    /// <summary>
    /// </summary>
    [Column("FBRANCH")]
    [SugarColumn(ColumnName = "FBRANCH")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Fbranch长度不能超出20")]
    public string Fbranch { get; set; }

    /// <summary>
    /// </summary>
    [Column("FCODE")]
    [SugarColumn(ColumnName = "FCODE")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Fcode长度不能超出20")]
    public string Fcode { get; set; }

    /// <summary>
    ///     å…¬å¸
    /// </summary>
    [Column("FCOMPANY")]
    [SugarColumn(ColumnName = "FCOMPANY")] //用于SqlSugar
    [StringLength(1000, ErrorMessage = "公司长度不能超出1000")]
    public string Fcompany { get; set; }

    /// <summary>
    ///     å·¥åŽ‚
    /// </summary>
    [Column("FFACTORY")]
    [SugarColumn(ColumnName = "FFACTORY")] //用于SqlSugar
    [StringLength(1000, ErrorMessage = "工厂长度不能超出1000")]
    public string Ffactory { get; set; }

    /// <summary>
    ///     é¦–次登陆
    /// </summary>
    [Column("FIRST_LOGIN")]
    [SugarColumn(ColumnName = "FIRST_LOGIN")] //用于SqlSugar
    public decimal? FirstLogin { get; set; }

    /// <summary>
    /// </summary>
    [Column("FLOGIN_NAME")]
    [SugarColumn(ColumnName = "FLOGIN_NAME")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "FloginName长度不能超出20")]
    public string FloginName { get; set; }

    /// <summary>
    /// </summary>
    [Column("FNAME")]
    [SugarColumn(ColumnName = "FNAME")] //用于SqlSugar
    [StringLength(40, ErrorMessage = "Fname长度不能超出40")]
    public string Fname { get; set; }

    /// <summary>
    /// </summary>
    [Column("FPASSWORD")]
    [SugarColumn(ColumnName = "FPASSWORD")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "Fpassword长度不能超出100")]
    public string Fpassword { get; set; }

    /// <summary>
    /// </summary>
    [Column("FPLANT")]
    [SugarColumn(ColumnName = "FPLANT")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Fplant长度不能超出20")]
    public string Fplant { get; set; }

    /// <summary>
    /// </summary>
    [Column("FREADONLY")]
    [SugarColumn(ColumnName = "FREADONLY")] //用于SqlSugar
    [StringLength(20, ErrorMessage = "Freadonly长度不能超出20")]
    public string Freadonly { get; set; }

    /// <summary>
    /// </summary>
    [Column("FSYSTEM")]
    [SugarColumn(ColumnName = "FSYSTEM")] //用于SqlSugar
    [StringLength(10, ErrorMessage = "Fsystem长度不能超出10")]
    public string Fsystem { get; set; }

    /// <summary>
    ///     æ˜¯å¦ä¸ºé‡‡é›†äººå‘˜
    /// </summary>
    [Column("ISACQ")]
    [SugarColumn(ColumnName = "ISACQ")] //用于SqlSugar
    public decimal? Isacq { get; set; }

    /// <summary>
    ///     1为离职，0为正常员工
    /// </summary>
    [Column("ISDEPARTURE")]
    [SugarColumn(ColumnName = "ISDEPARTURE")] //用于SqlSugar
    public decimal? Isdeparture { get; set; }

    /// <summary>
    ///     æ˜¯å¦ä¸ºç®¡ç†äººå‘˜
    /// </summary>
    [Column("ISMANAGER")]
    [SugarColumn(ColumnName = "ISMANAGER")] //用于SqlSugar
    public decimal? Ismanager { get; set; }

    /// <summary>
    /// </summary>
    [Column("LASTLOGIN")]
    [SugarColumn(ColumnName = "LASTLOGIN")] //用于SqlSugar
    public DateTime? Lastlogin { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [Column("LASTUPDATE_BY")]
    [SugarColumn(ColumnName = "LASTUPDATE_BY")] //用于SqlSugar
    [StringLength(30, ErrorMessage = "最后更新人长度不能超出30")]
    public string LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¥æœŸ
    /// </summary>
    [Column("LASTUPDATE_DATE")]
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //用于SqlSugar
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     1为开发用户，0为一般操作用户
    /// </summary>
    [Column("LEVER")]
    [SugarColumn(ColumnName = "LEVER")] //用于SqlSugar
    public decimal? Lever { get; set; }

    /// <summary>
    ///     æœ‰æ•ˆæœŸ
    /// </summary>
    [Column("PERIOD_VALIDITY")]
    [SugarColumn(ColumnName = "PERIOD_VALIDITY")] //用于SqlSugar
    public DateTime? PeriodValidity { get; set; }

    /// <summary>
    /// </summary>
    [Column("PRD")]
    [SugarColumn(ColumnName = "PRD")] //用于SqlSugar
    public decimal? Prd { get; set; }

    /// <summary>
    /// </summary>
    [Column("PSW_EDIT_TIME")]
    [SugarColumn(ColumnName = "PSW_EDIT_TIME")] //用于SqlSugar
    public DateTime? PswEditTime { get; set; }

    /// <summary>
    ///     è´¨é‡æ¨¡å—首件确认-原因分析责任人
    /// </summary>
    [Column("QM_USER")]
    [SugarColumn(ColumnName = "QM_USER")] //用于SqlSugar
    public decimal? QmUser { get; set; }

    /// <summary>
    ///     è§’色
    /// </summary>
    [Column("ROLEID")]
    [SugarColumn(ColumnName = "ROLEID")] //用于SqlSugar
    public decimal? Roleid { get; set; }

    /// <summary>
    ///     æ˜¯å¦ä¸ºä¸´æ—¶ç”¨æˆ·
    /// </summary>
    [Column("STATUS")]
    [SugarColumn(ColumnName = "STATUS")] //用于SqlSugar
    public decimal? Status { get; set; }

    /// <summary>
    /// </summary>
    [Column("TET")]
    [SugarColumn(ColumnName = "TET")] //用于SqlSugar
    public decimal? Tet { get; set; }
    [SugarColumn(ColumnName = "IS_SYS")]
    public int? IsSys { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}

 MES.Service/service/BasicData/MesCustomerManager.cs

@@ -110,8 +110,8 @@

    private bool DeleteCustomer(SqlSugarScope db, decimal customerId)
    {
        var deleteById = db.Deleteable<MesCustomer>().In(customerId)
            .ExecuteCommand();
        var deleteById = db.Deleteable<MesCustomer>()
            .Where(s => s.Id == customerId).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -171,7 +171,8 @@
        List<MesCustomer> customerList)
    {
        var ids = customerList.Select(it => it.Id).ToArray();
        var deleteByIds = db.Deleteable<MesCustomer>().In(ids).ExecuteCommand();
        var deleteByIds = db.Deleteable<MesCustomer>()
            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
        if (deleteByIds > 0)
            return true;


 MES.Service/service/BasicData/MesDepotsManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -83,22 +82,11 @@
    // æ’入或更新仓库的方法
    private bool InsertOrUpdate(SqlSugarScope db, MesDepots entity)
    {
        var exists = db.Queryable<MesDepots>()
            .Any(e => e.DepotId == entity.DepotId);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            if (update > 0)
                return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
        }

        return false;
        db.Deleteable<MesDepots>()
            .Where(s => s.DepotId == entity.DepotId)
            .ExecuteCommand();
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
    }

    // å°† ErpDepots å¯¹è±¡è½¬æ¢ä¸º MesDepots å¯¹è±¡çš„方法
@@ -116,7 +104,6 @@
            Zuid = depots.FGroup,
            FSubsidiary = depots.FUseOrgId,
            Fumbrella = depots.FCreateOrgId,

            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",

 MES.Service/service/BasicData/MesItemTypeManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;

@@ -42,8 +41,9 @@

    private bool DeleteItemType(decimal id)
    {
        var deleteById = base.DeleteById(id);
        if (deleteById)
        var deleteById = Db.Deleteable<MesItemType>()
            .Where(it => it.Id == id).ExecuteCommand();
        if (deleteById > 0)
            return true;

        throw new NotImplementedException("删除失败");

 MES.Service/service/BasicData/MesItemsManager.cs

@@ -108,7 +108,8 @@

    private bool DeleteItem(SqlSugarScope db, decimal itemId)
    {
        var deleteById = db.Deleteable<MesItems>().In(itemId).ExecuteCommand();
        var deleteById = db.Deleteable<MesItems>()
            .Where(s => s.Id == itemId).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -179,7 +180,8 @@
    private bool DeleteItemBatch(SqlSugarScope db, List<MesItems> itemList)
    {
        var ids = itemList.Select(it => it.Id).ToArray();
        var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
        var deleteByIds = db.Deleteable<MesItems>()
            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
        if (deleteByIds > 0)
            return true;


 MES.Service/service/BasicData/MesPositionManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -64,28 +63,17 @@
    // æ’入或更新岗位的方法
    private bool InsertOrUpdatePosition(SqlSugarScope db, MesPosition entity)
    {
        var exists = db.Queryable<MesPosition>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            if (update > 0)
                return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
        }

        return false;
        db.Deleteable<MesPosition>()
            .Where(s => s.Id == entity.Id).ExecuteCommand();
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
    }

    // åˆ é™¤å²—位的方法
    private bool DeletePosition(SqlSugarScope db, decimal positionId)
    {
        var deleteById = db.Deleteable<MesPosition>().In(positionId)
            .ExecuteCommand();
        var deleteById = db.Deleteable<MesPosition>()
            .Where(s => s.Id == positionId).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -200,7 +188,10 @@
        List<MesPosition> positionList)
    {
        var ids = positionList.Select(it => it.Id).ToArray();
        var deleteByIds = db.Deleteable<MesPosition>().In(ids).ExecuteCommand();

        var deleteByIds = db.Deleteable<MesPosition>()
            .Where(s => ids.Contains(s.Id)).ExecuteCommand();

        if (deleteByIds > 0)
            return true;

@@ -211,10 +202,6 @@
    private bool InsertOrUpdatePositionBatch(SqlSugarScope db,
        List<MesPosition> positionList)
    {
        foreach (var entity in positionList)
            if (!InsertOrUpdatePosition(db, entity))
                return false;

        return true;
        return positionList.All(entity => InsertOrUpdatePosition(db, entity));
    }
}

 MES.Service/service/BasicData/MesStaffManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -28,6 +27,7 @@
                    break;
                case "2":
                case "4":
                    DeleteStaff(db, sysUser, entity.Id);
                    if (InsertOrUpdateStaff(db, sysUser, entity)) // æ’入或更新员工
                        return 1;
                    break;
@@ -62,47 +62,23 @@
    private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
        MesStaff entity)
    {
        var exists = db.Queryable<SysUser>().Any(u => u.Sid == sysUser.Sid);
        if (exists)
        {
            var updateUser = db.Updateable<SysUser>()
                .SetColumns(s => s.Fcode == sysUser.Fcode)
                .SetColumns(s => s.Fname == sysUser.Fname)
                .Where(s => s.Sid == sysUser.Sid)
                .ExecuteCommand();
            if (updateUser > 0)
            {
                var updateStaff = db.Updateable(entity).ExecuteCommand();
                if (updateStaff > 0)
                    return true;
            }
        }
        else
        {
            var insertUser = db.Insertable(sysUser).ExecuteCommand();
            if (insertUser > 0)
            {
                var insertStaff = db.Insertable(entity).ExecuteCommand();
                if (insertStaff > 0)
                    return true;
            }
        }

        return false;
        var insertUser = db.Insertable(sysUser).ExecuteCommand();
        if (insertUser <= 0) return false;
        var insertStaff = db.Insertable(entity).ExecuteCommand();
        return insertStaff > 0;
    }

    // åˆ é™¤å‘˜å·¥çš„方法
    private bool DeleteStaff(SqlSugarScope db, SysUser sysUser, decimal staffId)
    {
        var deleteUser = db.Deleteable<SysUser>()
            .Where(s => s.Sid == sysUser.Sid).ExecuteCommand();
        if (deleteUser > 0)
        {
            var deleteStaff =
                db.Deleteable<MesStaff>().In(staffId).ExecuteCommand();
            if (deleteStaff > 0)
                return true;
        }
            .Where(s => s.Account == sysUser.Account).ExecuteCommand();
        if (deleteUser <= 0) throw new NotImplementedException("反审核失败");
        var deleteStaff =
            db.Deleteable<MesStaff>()
                .Where(s => s.Id == staffId).ExecuteCommand();
        if (deleteStaff > 0)
            return true;

        throw new NotImplementedException("反审核失败");
    }
@@ -116,14 +92,15 @@
            StaffNo = staff.FStaffNumber,
            StaffName = staff.FName,
            DepartmentName = staff.FPostDept,
            PositionName = staff.FPost,
            PositionCode = staff.FPostId,
            PhoneNumber = staff.FMobile,
            Remark = staff.FDescription,
            FforbidStatus = staff.FForbidStatus,
            FSubsidiary = staff.FUSEORGID,
            Fumbrella = staff.FCREATEORGID,
            FSubsidiary = staff.FUseOrgId,
            Fumbrella = staff.FCreateOrgId,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now
            LastupdateDate = DateTime.Now,
            Type = staff.Type
        };

        if (staff.FStaffStartDate != null)
@@ -138,26 +115,11 @@
    {
        return new SysUser
        {
            Sid = Convert.ToDecimal(staff.Id),
            Fcode = staff.FStaffNumber,
            Fname = staff.FName,
            Fpassword = "8+()./,", // åˆå§‹å¯†ç 
            Fsystem = "宁波利特舜",
            Lever = 0,
            Fcompany = "1000",
            Ffactory = "1000",
            DelFlag = 0,
            Ismanager = 0,
            Isacq = 0,
            ExpField9 = "1020",
            QmUser = 0,
            Status = 0,
            Isdeparture = 0,
            CheckFlag = 0,
            ExpFiel12 = 0,
            Dev = 0,
            Tet = 0,
            Prd = 1
            Account = staff.FStaffNumber,
            UserName = staff.FName,
            Password = "E1ADC3949BA59ABBE56E057F2F883E", // åˆå§‹å¯†ç 
            DepartNo = staff.FPostDept,
            Type = staff.Type
        };
    }

@@ -238,11 +200,12 @@
    private bool InsertStaffBatch(SqlSugarScope db, List<SysUser> userList,
        List<MesStaff> staffList)
    {
        var userInsert = userList.FindAll(s => s.Type == "INSERT");
         
        var userInsert = userList.FindAll(s => s.Type == "2");
        var executeCommand = db.Insertable(userInsert).ExecuteCommand();
        if (executeCommand > 0)
            if (db.Insertable(staffList).ExecuteCommand() > 0)
                return true;
        if (executeCommand <= 0) throw new ArgumentNullException("审核失败");
        if (db.Insertable(staffList).ExecuteCommand() > 0)
            return true;

        throw new ArgumentNullException("审核失败");
    }
@@ -251,17 +214,16 @@
    private bool DeleteStaffBatch(SqlSugarScope db, List<SysUser> userList,
        List<MesStaff> staffList)
    {
        var sid = userList.FindAll(s => s.Type == "DELETE").Select(s => s.Sid)
        var sid = userList.FindAll(s => s.Type == "3").Select(s => s.Account)
            .ToArray();
        var result = db.Deleteable<SysUser>()
            .Where(s => sid.Contains(s.Sid)).ExecuteCommand();
            .Where(s => sid.Contains(s.Account)).ExecuteCommand();

        if (result > 0)
        {
            var ids = staffList.Select(it => it.Id).ToArray();
            if (db.Deleteable<MesStaff>().In(ids).ExecuteCommand() > 0)
                return true;
        }
        if (result <= 0) throw new ArgumentNullException("反审核失败");
        var ids = staffList.Select(it => it.Id).ToArray();
        if (db.Deleteable<MesStaff>()
                .Where(s => ids.Contains(s.Id)).ExecuteCommand() > 0)
            return true;

        throw new ArgumentNullException("反审核失败");
    }
@@ -272,7 +234,7 @@
    {
        foreach (var sysUser in userList)
        {
            var entity = staffList.First(s => s.Id == sysUser.Sid);
            var entity = staffList.First(s => s.StaffNo == sysUser.Account);
            if (!InsertOrUpdateStaff(db, sysUser, entity)) return false;
        }


 MES.Service/service/BasicData/OrganizeManager.cs

@@ -1,18 +1,12 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using System.Xml.Linq;
using MES.Service.Modes;
using SqlSugar;

namespace MES.Service.service;

public class OrganizeManager : Repository<Organize>
public class OrganizeManager : Repository<SysOrganization>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„方法
    //Mesorganization
    //这里面写的代码不会给覆盖,如果要重新生成请删除 OrganizeManager.cs
    public bool Save(ErpOrganize item)
    {
        var entity = GetOrganize(item);
@@ -22,11 +16,11 @@
            switch (item.Type)
            {
                case "0":
                    if (UpdateOrganizetatus(db, entity.Id, "A"))
                    if (UpdateOrganizetatus(db, entity.FNumber, "A"))
                        return 1;
                    break;
                case "1":
                    if (UpdateOrganizetatus(db, entity.Id, "B"))
                    if (UpdateOrganizetatus(db, entity.FNumber, "B"))
                        return 1;
                    break;
                case "2":
@@ -34,7 +28,7 @@
                        return 1;
                    break;
                case "3":
                    if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
                    if (DeleteItem(db, entity.FNumber))
                        return 1;
                    break;
                case "4":
@@ -50,9 +44,9 @@
        }) > 0;
    }

    public bool SaveList(List<ErpOrganize> Organize)
    public bool SaveList(List<ErpOrganize> SysOrganization)
    {
        var list = Organize.Select(GetOrganize).ToList();
        var list = SysOrganization.Select(GetOrganize).ToList();
        var groupBy = list.GroupBy(s => s.Type)
            .ToDictionary(g => g.Key, g => g.ToList());

@@ -90,12 +84,12 @@
        }) > 0;
    }

    private bool UpdateOrganizetatus(SqlSugarScope db, string itemId,
    private bool UpdateOrganizetatus(SqlSugarScope db, string number,
        string status)
    {
        var result = db.Updateable<Organize>()
            .SetColumns(s => s.Fforbidstatus == status)
            .Where(s => s.Id == itemId).ExecuteCommand();
        var result = db.Updateable<SysOrganization>()
            .SetColumns(s => s.IsStatus == status.Equals("A"))
            .Where(s => s.FNumber == number).ExecuteCommand();

        if (result > 0)
            return true;
@@ -103,7 +97,7 @@
        throw new NotImplementedException(status == "A" ? "启用失败" : "禁用失败");
    }

    private bool InsertItem(SqlSugarScope db, Organize entity)
    private bool InsertItem(SqlSugarScope db, SysOrganization entity)
    {
        var insert = db.Insertable(entity).ExecuteCommand();
        if (insert > 0)
@@ -112,44 +106,34 @@
        throw new NotImplementedException("插入失败");
    }

    private bool DeleteItem(SqlSugarScope db, decimal itemId)
    private bool DeleteItem(SqlSugarScope db, string number)
    {
        var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
        var deleteById = db.Deleteable<SysOrganization>()
            .Where(s => s.FNumber == number).ExecuteCommand();
        if (deleteById > 0)
            return true;

        throw new NotImplementedException("删除失败");
    }

    private Organize GetOrganize(ErpOrganize Organize)
    private SysOrganization GetOrganize(ErpOrganize organize)
    {
        return new Organize
        return new SysOrganization
        {
            Id = Organize.Id,
            Fnumber = Organize.FNumber,
            Fname = Organize.FName,
            Type = Organize.Type,
            FDescription = Organize.FDescription,
            FParentID = Organize.FParentID,
            FCreateDate = Organize.FCreateDate != null
                ? DateTime.ParseExact(Organize.FCreateDate,
                    "yyyy-MM-dd HH:mm:ss", null)
                : null,
            FFORBIDORID = Organize.FFORBIDORID,
            FFORBIDDATE = Organize.FFORBIDDATE != null
                ? DateTime.ParseExact(Organize.FFORBIDDATE,
                    "yyyy-MM-dd HH:mm:ss", null)
                : null
            Name = organize.FName,
            FNumber = organize.FNumber,
            FParentlD = organize.FParentID,
            IsStatus = organize.FForbidStatus.Equals("A")
        };
    }

    private bool UpdateOrganizetatusBatch(SqlSugarScope db,
        List<Organize> itemList, string status)
        List<SysOrganization> itemList, string status)
    {
        var ids = itemList.Select(it => it.Id).ToArray();
        var result = db.Updateable<Organize>()
            .SetColumns(s => s.Fforbidstatus == status)
            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
        var numbers = itemList.Select(it => it.FNumber).ToArray();
        var result = db.Updateable<SysOrganization>()
            .SetColumns(s => s.IsStatus == "A".Equals(status))
            .Where(s => numbers.Contains(s.FNumber)).ExecuteCommand();

        if (result > 0)
            return true;
@@ -157,7 +141,8 @@
        throw new NotImplementedException(status == "A" ? "启用失败" : "禁用失败");
    }

    private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
    private bool InsertItemBatch(SqlSugarScope db,
        List<SysOrganization> itemList)
    {
        var insertRange = db.Insertable(itemList).ExecuteCommand();
        if (insertRange > 0)
@@ -166,36 +151,30 @@
        throw new NotImplementedException("插入失败");
    }

    private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
    private bool DeleteItemBatch(SqlSugarScope db,
        List<SysOrganization> itemList)
    {
        var ids = itemList.Select(it => it.Id).ToArray();
        var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
        var numbers = itemList.Select(it => it.FNumber).ToArray();
        var deleteByIds = db.Deleteable<SysOrganization>()
            .Where(s => numbers.Contains(s.FNumber)).ExecuteCommand();
        if (deleteByIds > 0)
            return true;

        throw new NotImplementedException("删除失败");
    }

    private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
    private bool InsertOrUpdate(SqlSugarScope db, SysOrganization entity)
    {
        var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            if (update > 0)
                return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
        }
        db.Deleteable<SysOrganization>()
            .Where(s => s.FNumber == entity.FNumber).ExecuteCommand();

        return false;
        var insert = db.Insertable(entity).ExecuteCommand();

        return insert > 0;
    }

    private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
    private bool InsertOrUpdateBatch(SqlSugarScope db,
        List<SysOrganization> itemList)
    {
        foreach (var entity in itemList)
            if (!InsertOrUpdate(db, entity))
@@ -203,65 +182,4 @@

        return true;
    }

    #region æ•™å­¦æ–¹æ³•

    /// <summary>
    /// ä»“储方法满足不了复杂业务需求，业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    {
        /*********查询*********/

        var data1 = base.GetById(1); //根据ID查询
        var data2 = base.GetList(); //查询所有
        var data3 = base.GetList(it => 1 == 1); //根据条件查询  
        //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错

        var p = new PageModel() { PageIndex = 1, PageSize = 2 }; // åˆ†é¡µæŸ¥è¯¢
        var data5 = base.GetPageList(it => 1 == 1, p);
        Console.Write(p.TotalCount); //返回总数

        var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc); // åˆ†é¡µæŸ¥è¯¢åŠ æŽ’序
        Console.Write(p.TotalCount); //返回总数

        List<IConditionalModel> conModels = new(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’序
        conModels.Add(new ConditionalModel()
        {
            FieldName = typeof(Organize).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal,
            FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);

        AsQueryable().Where(x => 1 == 1).ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能


        /*********插入*********/
        var insertData = new Organize() { }; //测试参数
        var insertArray = new Organize[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入


        /*********更新*********/
        var updateData = new Organize() { }; //测试参数
        var updateArray = new Organize[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new Organize() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列，其它列不更新，条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入


        /*********删除*********/
        var deldata = new Organize() { }; //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new int[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2).ExecuteCommand(); //转成Deleteable实现复杂的操作
    }

    #endregion
}

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -76,8 +75,8 @@
    // åˆ é™¤éƒ¨é—¨çš„方法
    private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
    {
        var deleteById = db.Deleteable<SysDepartment>().In(departmentId)
            .ExecuteCommand();
        var deleteById = db.Deleteable<SysDepartment>()
            .Where(s => s.Id == departmentId).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -88,21 +87,11 @@
    private bool InsertOrUpdateDepartment(SqlSugarScope db,
        SysDepartment entity)
    {
        var exists = db.Queryable<SysDepartment>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            if (update > 0)
                return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
        }
        db.Deleteable<SysDepartment>()
            .Where(s => s.Id == entity.Id).ExecuteCommand();

        return false;
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
    }

    // å°† ErpDepartment å¯¹è±¡è½¬æ¢ä¸º SysDepartment å¯¹è±¡çš„方法
@@ -213,7 +202,9 @@
    {
        var ids = departmentList.Select(it => it.Id).ToArray();
        var deleteByIds =
            db.Deleteable<SysDepartment>().In(ids).ExecuteCommand();
            db.Deleteable<SysDepartment>()
                .Where(s => ids.Contains(s.Id)).ExecuteCommand();

        if (deleteByIds > 0)
            return true;


 MESApplication/Controllers/BasicData/OrganizeController.cs

@@ -1,16 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Dynamic;
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
using MES.Service.Dto.webApi;
using MES.Service.service.BasicData;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;

namespace MESApplication.Controllers;
@@ -111,155 +104,6 @@

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }
    //  private OrganizeManager m = new OrganizeManager();


    /***进入模版管理可以修改模版***/

    /// <summary>
    /// èŽ·å–所有
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetList")]
    public ResponseResult GetList()
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetList();
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    /// æ ¹æ®ä¸»é”®èŽ·å–
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetById")]
    public ResponseResult GetById(int id)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetById(id);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// æ ¹æ®ä¸»é”®åˆ é™¤
    /// </summary>
    /// <returns></returns>
    [HttpPost("DeleteByIds")]
    public ResponseResult DeleteByIds([FromBody] object[] ids)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.DeleteByIds(ids);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// æ·»åŠ  
    /// </summary>
    /// <returns></returns>
    [HttpPost("Insert")]
    public ResponseResult Add([FromBody] Organize data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Insert(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// æ·»åŠ è¿”回自增
    /// </summary>
    /// <returns></returns>
    [HttpPost("InsertReturnIdentity")]
    public ResponseResult InsertReturnIdentity([FromBody] Organize data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.InsertReturnIdentity(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// ä¿®æ”¹
    /// </summary>
    /// <returns></returns>
    [HttpPost("Update")]
    public ResponseResult Update([FromBody] Organize data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Update(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }