From 729c87c230c6afcd698ead19732420a3195d58ad Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 23 十月 2024 10:43:04 +0800
Subject: [PATCH] 接口调整
---
MES.Service/Modes/SysDepartment.cs | 109 +++
MES.Service/service/BasicData/MesStaffManager.cs | 110 +---
MES.Service/Modes/SysOrganization.cs | 93 +++
MES.Service/service/BasicData/MesPositionManager.cs | 37 -
MES.Service/service/BasicData/SysDepartmentManager.cs | 29
MES.Service/Modes/MesPosition.cs | 51 +
MES.Service/Modes/SysUser.cs | 338 ++-----------
MES.Service/Dto/webApi/ErpStaff.cs | 6
MES.Service/service/BasicData/MesCustomerManager.cs | 7
MES.Service/service/BasicData/OrganizeManager.cs | 168 +-----
MES.Service/Modes/MesStaff.cs | 40
MESApplication/Controllers/BasicData/OrganizeController.cs | 162 ------
MES.Service/Modes/MesDepots.cs | 182 +++++-
MES.Service/service/BasicData/MesDepotsManager.cs | 25
MES.Service/service/BasicData/MesItemsManager.cs | 6
MES.Service/Modes/Organize.cs | 12
MES.Service/service/BasicData/MesItemTypeManager.cs | 8
17 files changed, 573 insertions(+), 810 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpStaff.cs b/MES.Service/Dto/webApi/ErpStaff.cs
index 03ce664..17499ab 100644
--- a/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index fae92cb..54f53cb 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/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>
- /// 浠撲綅缁処D
- /// </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>
/// 浣跨敤绲勭箶
diff --git a/MES.Service/Modes/MesPosition.cs b/MES.Service/Modes/MesPosition.cs
index 5086bb0..499d912 100644
--- a/MES.Service/Modes/MesPosition.cs
+++ b/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>
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 4de05cc..951bc2f 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Organize.cs b/MES.Service/Modes/Organize.cs
index 0188209..d9f03e8 100644
--- a/MES.Service/Modes/Organize.cs
+++ b/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>
/// 涓婄骇缁勭粐
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index b43a1ff..f37f5a0 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysOrganization.cs b/MES.Service/Modes/SysOrganization.cs
new file mode 100644
index 0000000..d3552b5
--- /dev/null
+++ b/MES.Service/Modes/SysOrganization.cs
@@ -0,0 +1,93 @@
+锘縰sing 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; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysUser.cs b/MES.Service/Modes/SysUser.cs
index a318f0d..9a97441 100644
--- a/MES.Service/Modes/SysUser.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 2965234..cb96e29 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/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;
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index f495080..f1c7591 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing 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",
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index 5059669..d027747 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing 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("鍒犻櫎澶辫触");
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 933b47e..bb2e9a0 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/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;
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index 5cd83e4..f648dca 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing 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));
}
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 42269b8..1346cb3 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing 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;
}
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index 94ad07e..a9b7cc8 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -1,18 +1,12 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
-using MES.Service.Modes;
+锘縰sing 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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- 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);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=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
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 764532e..81d2e93 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing 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;
diff --git a/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
index fd37705..9253bec 100644
--- a/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ b/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -1,16 +1,9 @@
-锘縰sing 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;
+锘縰sing 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);
}
}
--
Gitblit v1.9.3