From b884e533c4d906d3e004ea51750591f04863f881 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 22 八月 2025 19:37:06 +0800
Subject: [PATCH] 基础资料的更新
---
MES.Service/Modes/SysDepartment.cs | 139 ++--
MES.Service/service/BasicData/MesUnitManager.cs | 24
MES.Service/service/BasicData/MesStaffManager.cs | 12
MES.Service/Modes/MesUnit.cs | 160 ++--
MES.Service/service/BasicData/MesPositionManager.cs | 13
MES.Service/Modes/MesItems.cs | 328 ++++-------
MES.Service/Dto/webApi/ErpDepots.cs | 7
MES.Service/service/BasicData/SysDepartmentManager.cs | 35
MES.Service/Modes/MesPosition.cs | 78 +-
MES.Service/service/BasicData/MesCustomerManager.cs | 23
MES.Service/service/BasicData/MesSupplierManager.cs | 14
MES.Service/Dto/webApi/ErpUnit.cs | 2
MES.Service/Modes/MesSupplier.cs | 147 ++--
MES.Service/Modes/MesCustomer.cs | 127 ++--
MES.Service/Modes/MesStaff.cs | 105 +-
MES.Service/Modes/MesDepots.cs | 284 ++++-----
MES.Service/service/BasicData/MesDepotsManager.cs | 29
MES.Service/service/BasicData/MesItemsManager.cs | 42
MES.Service/Modes/MesItemType.cs | 108 ++-
MES.Service/service/BasicData/MesItemTypeManager.cs | 6
20 files changed, 820 insertions(+), 863 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpDepots.cs b/MES.Service/Dto/webApi/ErpDepots.cs
index cf81e60..3e4da2b 100644
--- a/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/MES.Service/Dto/webApi/ErpDepots.cs
@@ -2,14 +2,14 @@
public class ErpDepots
{
- public string Id { get; set; }
+ public string? Id { get; set; }
public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
public string? FAllowMinusQty { get; set; }
public string? FPrincipal { get; set; }
public string? FStockProperty { get; set; }
- public string? FSUPPLIERID { get; set; }
+ public string? FSupplierId { get; set; }
public string? FCustomerId { get; set; }
public string? FDocumentStatus { get; set; }
public string? FForbidStatus { get; set; }
@@ -17,7 +17,4 @@
public string? FCreateOrgId { get; set; }
public string? FUseOrgId { get; set; }
public string? FStockStatusType { get; set; }
-
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpUnit.cs b/MES.Service/Dto/webApi/ErpUnit.cs
index bc9fda6..8b26f88 100644
--- a/MES.Service/Dto/webApi/ErpUnit.cs
+++ b/MES.Service/Dto/webApi/ErpUnit.cs
@@ -9,7 +9,7 @@
public string? FUnitGroupId { get; set; }
public string? FConvertDenominator { get; set; }
public string? FCurrentUnitId { get; set; }
- public double? FConvertNumerator { get; set; }
+ public string? FConvertNumerator { get; set; }
public string? FBaseUnit { get; set; }
public string? FRoundType { get; set; }
public int? FPrecision { get; set; }
diff --git a/MES.Service/Modes/MesCustomer.cs b/MES.Service/Modes/MesCustomer.cs
index 022660d..d7f9cd2 100644
--- a/MES.Service/Modes/MesCustomer.cs
+++ b/MES.Service/Modes/MesCustomer.cs
@@ -14,183 +14,176 @@
public Guid Guid { get; set; }
/// <summary>
- /// ID
- /// </summary>
+ /// ID
+ ///</summary>
[SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
+ /// 瀹㈡埛缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "cust_no")]
public string? CustNo { get; set; }
/// <summary>
- /// 鍦板尯
- /// </summary>
+ /// 鍦板尯
+ ///</summary>
[SugarColumn(ColumnName = "land")]
public string? Land { get; set; }
/// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
+ /// 瀹㈡埛鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "cust_name")]
public string? CustName { get; set; }
/// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
+ /// 瀹㈡埛绠�绉�
+ ///</summary>
[SugarColumn(ColumnName = "cust_sname")]
public string? CustSname { get; set; }
/// <summary>
- /// 鍦板潃
- /// </summary>
+ /// 鍦板潃
+ ///</summary>
[SugarColumn(ColumnName = "stras")]
public string? Stras { get; set; }
/// <summary>
- /// 鐢佃瘽
- /// </summary>
+ /// 鐢佃瘽
+ ///</summary>
[SugarColumn(ColumnName = "telf1")]
public string? Telf1 { get; set; }
/// <summary>
- /// 浼犵湡
- /// </summary>
+ /// 浼犵湡
+ ///</summary>
[SugarColumn(ColumnName = "telfx")]
public string? Telfx { get; set; }
/// <summary>
- /// 鑱旂郴浜�
- /// </summary>
+ /// 鑱旂郴浜�
+ ///</summary>
[SugarColumn(ColumnName = "anred")]
public string? Anred { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
+ /// 鍒涘缓浜�
+ ///</summary>
[SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鏈�鍚庝慨鏀规椂闂�
- /// </summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�鍚庝慨鏀逛汉
- /// </summary>
+ /// 鏈�鍚庝慨鏀逛汉
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "remark")]
public string? Remark { get; set; }
/// <summary>
- /// 鍏徃
- /// </summary>
+ /// 鍏徃
+ ///</summary>
[SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
+ /// 鍒嗗巶缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 鐗╂枡鏄惁鍏辩(鏄紝鍚�)
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鐗╂枡鏄惁鍏辩(鏄紝鍚�)
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "item_c")]
public int? ItemC { get; set; }
/// <summary>
- /// 鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�)
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�)
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "item_sap")]
public int? ItemSap { get; set; }
/// <summary>
- /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "lot_flag")]
public int? LotFlag { get; set; }
/// <summary>
- /// WMS鏄惁鍙戦�佹暟鎹細1宸插彂閫侊紝鍏朵粬鍧囨湭鍙戦��
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// WMS鏄惁鍙戦�佹暟鎹細1宸插彂閫侊紝鍏朵粬鍧囨湭鍙戦��
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "iscommit")]
public int? Iscommit { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "fforbidstatus")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 閿�鍞憳
- /// </summary>
+ /// 閿�鍞憳
+ ///</summary>
[SugarColumn(ColumnName = "fseller")]
public string? Fseller { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
[SugarColumn(ColumnName = "remark3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
[SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
[SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- /// </summary>
+ /// 鍒涘缓缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "Fumbrella")]
public string? Fumbrella { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- /// </summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "FSubsidiary")]
public string? FSubsidiary { get; set; }
/// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "DATA_TYPE")]
public string? DataType { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
- /////////鏂板瀛楁鍖哄煙
-
- /// <summary>
- /// 瀹㈡埛鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "FPRIMARYGROUP")]
- public string? FPRIMARYGROUP { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index ac6cc7b..da16258 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -8,248 +8,202 @@
public class MesDepots
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
- public string Guid { get; set; }
+ public Guid Guid { get; set; }
/// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "depot_id")]
- public decimal DepotId { get; set; }
+ /// ID(SEQ_INV_ID)
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPOT_ID")]
+ public long 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")]
+ /// 澶囨敞
+ ///</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")]
- public DateTime? CreateDate { get; set; }
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public string? 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")]
- public DateTime? LastupdateDate { get; set; }
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public string? 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; }
+ /// 鐗╂枡浣跨敤
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ [SugarColumn(ColumnName = "TYPE_1")]
+ public long? Type1 { get; set; }
/// <summary>
- /// 鎴愬搧浣跨敤
- /// 榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "type_2")]
- public int? Type2 { get; set; }
+ /// 鎴愬搧浣跨敤
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ [SugarColumn(ColumnName = "TYPE_2")]
+ public long? Type2 { get; set; }
/// <summary>
- /// 浠撳簱绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "depottypecode")]
- public int? Depottypecode { get; set; }
+ /// 浠撳簱绫诲瀷缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPOTTYPECODE")]
+ public long? Depottypecode { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "company")]
+ /// 鍏徃浠ｇ爜
+ ///</summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// 鐪嬫澘鍥炬爣鏍峰紡
- /// </summary>
- [SugarColumn(ColumnName = "icon_type")]
- public int? IconType { get; set; }
+ /// 鐪嬫澘鍥炬爣鏍峰紡
+ ///</summary>
+ [SugarColumn(ColumnName = "ICON_TYPE")]
+ public long? IconType { get; set; }
/// <summary>
- /// 鏄惁濮斿浠撳簱
- /// 榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "is_wy")]
- public int? IsWy { get; set; }
+ /// 鏄惁濮斿浠撳簱
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ [SugarColumn(ColumnName = "IS_WY")]
+ public long? IsWy { get; set; }
/// <summary>
- /// 鏄惁涓嶈壇鍝佷粨
- /// 榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "is_ng")]
+ /// 鏄惁涓嶈壇鍝佷粨
+ /// 榛樿鍊�: ('0')
+ ///</summary>
+ [SugarColumn(ColumnName = "IS_NG")]
public string? IsNg { get; set; }
/// <summary>
- /// 浠撳簱鍦板潃
- /// </summary>
- [SugarColumn(ColumnName = "cwhaddress")]
+ /// 浠撳簱鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName = "CWHADDRESS")]
public string? Cwhaddress { get; set; }
/// <summary>
- /// 鐪嬫澘鏄剧ず鍖哄煙缂栧彿
- /// 榛樿鍊�: ((1))
- /// </summary>
- [SugarColumn(ColumnName = "pi_type")]
+ /// 鐪嬫澘鏄剧ず鍖哄煙缂栧彿
+ /// 榛樿鍊�: ('1')
+ ///</summary>
+ [SugarColumn(ColumnName = "PI_TYPE")]
public string? PiType { get; set; }
/// <summary>
- /// 鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "zuid")]
+ /// 鍒嗙粍
+ ///</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")]
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
+ [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
public string? ProductionWorkshop { get; set; }
/// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
- [SugarColumn(ColumnName = "material_properti")]
+ /// 0=鏅�氫粨,1=闇插ぉ浠�,2=瀵勫浠�,3=澶栧瘎浠�,4=鍦ㄥ埗鍝侊紝5=鎶ュ簾
+ ///</summary>
+ [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
- [SugarColumn(ColumnName = "remark3")]
+ /// 鍒涘缓缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_ORG")]
+ public long? CreateOrg { get; set; }
+
+ /// <summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "USE_ORG")]
+ public long? UseOrg { get; set; }
+
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "remark4")]
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "remark5")]
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "check_date")]
- public DateTime? CheckDate { get; set; }
+ /// 0 =涓嶇敓鏁堬紝 1=鐢熸晥
+ ///</summary>
+ [SugarColumn(ColumnName = "FORBID_STATUS")]
+ public string? ForbidStatus { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "check_by")]
- public string? CheckBy { get; set; }
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
/// <summary>
- /// 榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "check_status")]
- public bool? CheckStatus { get; set; }
-
- /// <summary>
- /// 鍒涘缓缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
- /// <summary>
- /// 浣跨敤缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLIER_ID")]
- public string? SupplierId { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [SugarColumn(ColumnName = "Client_Id")]
- public string? ClientId { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "department")]
- public string? Department { get; set; }
-
- /// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
- [SugarColumn(ColumnName = "Phone")]
- public string? Phone { get; set; }
+ /// 鎵瑰彿绠＄悊
+ ///</summary>
+ [SugarColumn(ColumnName = "IS_LOT")]
+ public string? IsLot { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [SugarColumn(ColumnName = "FCustomerId")]
- public string? FCustomerId { get; set; }
- /// <summary>
- /// 鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
- /// <summary>
- /// 搴撳瓨鐘舵�佺被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "FStockStatusType")]
- public string? FStockStatusType { get; set; }
-
- /// <summary>
- /// 鍚敤浠撲綅绠＄悊
- /// </summary>
- [SugarColumn(ColumnName = "FISOPENLOCATION")]
- public string? FISOPENLOCATION { get; set; }
-
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItemType.cs b/MES.Service/Modes/MesItemType.cs
index 36eafa7..5fc4b20 100644
--- a/MES.Service/Modes/MesItemType.cs
+++ b/MES.Service/Modes/MesItemType.cs
@@ -8,92 +8,114 @@
[SugarTable("MES_ITEM_TYPE")]
public class MesItemType
{
- /// <summary>
- /// </summary>
+ // <summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "id")]
- public decimal Id { get; set; }
+ /// ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ID")]
+ public long? Id { get; set; }
/// <summary>
- /// 绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "tcode")]
+ /// 绫诲瀷缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "TCODE")]
public string? Tcode { get; set; }
/// <summary>
- /// 绫诲瀷鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "tname")]
+ /// 绫诲瀷鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "TNAME")]
public string? Tname { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "remark")]
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string? Remark { 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 = "company")]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "factory")]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// IQC鍒嗙被
- /// </summary>
- [SugarColumn(ColumnName = "iqc_type")]
+ /// IQC鍒嗙被
+ ///</summary>
+ [SugarColumn(ColumnName = "IQC_TYPE")]
public string? IqcType { get; set; }
/// <summary>
- /// IQC鍒嗙被鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "iqc_type_name")]
+ /// IQC鍒嗙被鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "IQC_TYPE_NAME")]
public string? IqcTypeName { get; set; }
/// <summary>
- /// 涓婄骇鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "pgroup")]
+ /// 涓婄骇鍒嗙粍
+ ///</summary>
+ [SugarColumn(ColumnName = "PGROUP")]
public string? Pgroup { get; set; }
/// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "description")]
+ /// 鎻忚堪
+ ///</summary>
+ [SugarColumn(ColumnName = "DESCRIPTION")]
public string? Description { get; set; }
+ /// <summary>
+ /// 璁￠噺鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "UNIT")]
+ public string? Unit { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ ///</summary>
+ [SugarColumn(ColumnName = "FORBID_STATUS")]
+ public string? ForbidStatus { get; set; }
+
+ /// <summary>
+ /// 涓嬪彂缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "USE_ORG_ID")]
+ public string? UseOrgId { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 712d2bb..104fac4 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -9,412 +9,324 @@
public class MesItems
{
/// <summary>
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
+ /// 鐗╂枡ID
+ ///</summary>
[SugarColumn(ColumnName = "id")]
- public decimal Id { get; set; }
+ public long Id { get; set; }
/// <summary>
- /// 宸ュ巶
- /// </summary>
+ /// 宸ュ巶
+ ///</summary>
[SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 鍏徃缂栧彿
- /// </summary>
+ /// 鍏徃缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
- /// </summary>
+ /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "item_no")]
public string? ItemNo { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
+ /// 鐗╂枡鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "item_name")]
public string? ItemName { get; set; }
/// <summary>
- /// 鐗╂枡绠�绉�
- /// </summary>
+ /// 鐗╂枡绠�绉�
+ ///</summary>
[SugarColumn(ColumnName = "item_sname")]
public string? ItemSname { get; set; }
/// <summary>
- /// 瑙勬牸鍨嬪彿
- /// </summary>
+ /// 瑙勬牸鍨嬪彿
+ ///</summary>
[SugarColumn(ColumnName = "item_model")]
public string? ItemModel { get; set; }
/// <summary>
- /// 鐗╂枡鎻忚堪
- /// </summary>
+ /// 鐗╂枡鎻忚堪
+ ///</summary>
[SugarColumn(ColumnName = "item_description")]
public string? ItemDescription { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
+ /// 鐗╂枡鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "item_unit")]
public string? ItemUnit { get; set; }
/// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
+ /// 鐗╂枡绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "item_type")]
public string? ItemType { get; set; }
/// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
+ /// 浜у搧鐗堟湰
+ ///</summary>
[SugarColumn(ColumnName = "item_version")]
public string? ItemVersion { get; set; }
/// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "cust_no")]
public string? CustNo { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
+ /// 鍒涘缓浜�
+ ///</summary>
[SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�浣庡簱瀛�
- /// </summary>
+ /// 鏈�浣庡簱瀛�
+ ///</summary>
[SugarColumn(ColumnName = "lowlimit")]
- public double? Lowlimit { get; set; }
+ public decimal? Lowlimit { get; set; }
/// <summary>
- /// 鏈�澶у簱瀛�
- /// </summary>
+ /// 鏈�澶у簱瀛�
+ ///</summary>
[SugarColumn(ColumnName = "highlimit")]
- public double? Highlimit { get; set; }
+ public decimal? Highlimit { get; set; }
/// <summary>
- /// 鏈�灏忓寘瑁呮暟
- /// </summary>
+ /// 鏈�灏忓寘瑁呮暟
+ ///</summary>
[SugarColumn(ColumnName = "prd_pack")]
- public double? PrdPack { get; set; }
+ public decimal? PrdPack { get; set; }
/// <summary>
- /// 璁㈠崟鍗曚綅
- /// </summary>
+ /// 璁㈠崟鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "orderunit")]
public string? Orderunit { get; set; }
/// <summary>
- /// 閿�鍞崟浣�
- /// </summary>
+ /// 閿�鍞崟浣�
+ ///</summary>
[SugarColumn(ColumnName = "saleunit")]
public string? Saleunit { get; set; }
/// <summary>
- /// 搴撴埧鍗曚綅
- /// </summary>
+ /// 搴撴埧鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "storeunit")]
public string? Storeunit { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
+ /// 鐗╂枡ID
+ ///</summary>
[SugarColumn(ColumnName = "e_item_id")]
public long? EItemId { get; set; }
/// <summary>
- /// ERP鏂欏彿
- /// </summary>
+ /// ERP鏂欏彿
+ ///</summary>
[SugarColumn(ColumnName = "erp_item_no")]
public string? ErpItemNo { get; set; }
/// <summary>
- /// 榛樿浠撳簱
- /// </summary>
+ /// 榛樿浠撳簱id
+ ///</summary>
[SugarColumn(ColumnName = "depot_code")]
public string? DepotCode { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙被缂栧彿
- /// </summary>
+ /// 鐗╂枡鍒嗙被缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "ppbom00019124")]
public string? Ppbom00019124 { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙粍
- /// </summary>
+ /// 鐗╂枡鍒嗙粍
+ ///</summary>
[SugarColumn(ColumnName = "remarks")]
public string? Remarks { get; set; }
/// <summary>
- /// 閲囪喘鍛�
- /// </summary>
+ /// 閲囪喘鍛�
+ ///</summary>
[SugarColumn(ColumnName = "fpurchaserid")]
public string? Fpurchaserid { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "fforbidstatus")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鐗╂枡鍒嗙粍
- /// </summary>
+ /// 鐗╂枡鍒嗙粍
+ ///</summary>
[SugarColumn(ColumnName = "fmaterialgroup")]
public string? Fmaterialgroup { get; set; }
/// <summary>
- /// 瀹屽伐瓒呮敹姣斾緥
- /// </summary>
+ /// 瀹屽伐瓒呮敹姣斾緥
+ ///</summary>
[SugarColumn(ColumnName = "ffinishreceiptoverrate")]
- public decimal? Ffinishreceiptoverrate { get; set; }
+ public int? Ffinishreceiptoverrate { get; set; }
/// <summary>
- /// 鍙戞枡鏂瑰紡
- /// </summary>
+ /// 鍙戞枡鏂瑰紡
+ ///</summary>
[SugarColumn(ColumnName = "fissuetype")]
public string? Fissuetype { get; set; }
/// <summary>
- /// 鍚敤鎵瑰彿绠＄悊
- /// </summary>
+ /// 鍚敤鎵瑰彿绠＄悊
+ ///</summary>
[SugarColumn(ColumnName = "fisbatchmanage")]
public int? Fisbatchmanage { get; set; }
/// <summary>
- /// 閲囪喘鍗曚綅
- /// </summary>
+ /// 閲囪喘鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "fpurchaseunitid")]
- public decimal Fpurchaseunitid { get; set; }
+ public string? Fpurchaseunitid { get; set; }
/// <summary>
- /// 鎹熻�楃巼
- /// </summary>
+ /// 鎹熻�楃巼
+ ///</summary>
[SugarColumn(ColumnName = "loss_percent")]
public string? LossPercent { get; set; }
/// <summary>
- /// 鍔╄鐮�
- /// </summary>
+ /// 鍔╄鐮�
+ ///</summary>
[SugarColumn(ColumnName = "mnemonic_code")]
public string? MnemonicCode { get; set; }
/// <summary>
- /// 淇濊川鏈�
- /// </summary>
+ /// 淇濊川鏈�
+ ///</summary>
[SugarColumn(ColumnName = "exp_period")]
public string? ExpPeriod { get; set; }
/// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
[SugarColumn(ColumnName = "production_workshop")]
public string? ProductionWorkshop { get; set; }
/// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
+ /// 鐗╂枡灞炴��
+ ///</summary>
[SugarColumn(ColumnName = "material_properti")]
public string? MaterialProperti { get; set; }
/// <summary>
- /// 鐢熶骇鍗曚綅
- /// </summary>
+ /// 鐢熶骇鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "produce_unit")]
public string? ProduceUnit { get; set; }
/// <summary>
- /// 濮斿鍗曚綅
- /// </summary>
+ /// 濮斿鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "subcon_unit")]
public string? SubconUnit { get; set; }
/// <summary>
- /// 鍥剧墖1
- /// </summary>
+ /// 鍥剧墖1
+ ///</summary>
[SugarColumn(ColumnName = "bz06")]
public string? Bz06 { get; set; }
/// <summary>
- /// 鍥剧墖2
- /// </summary>
+ /// 鍥剧墖2
+ ///</summary>
[SugarColumn(ColumnName = "bz07")]
public string? Bz07 { get; set; }
/// <summary>
- /// 鍥剧墖3
- /// </summary>
+ /// 鍥剧墖3
+ ///</summary>
[SugarColumn(ColumnName = "bz08")]
public string? Bz08 { get; set; }
/// <summary>
- /// 鍥剧墖4
- /// </summary>
+ /// 鍥剧墖4
+ ///</summary>
[SugarColumn(ColumnName = "bz09")]
public string? Bz09 { get; set; }
/// <summary>
- /// 鍥剧墖5
- /// </summary>
+ /// 鍥剧墖5
+ ///</summary>
[SugarColumn(ColumnName = "bz10")]
public string? Bz10 { get; set; }
/// <summary>
- /// QC鍒嗙粍ID
- /// </summary>
+ /// QC鍒嗙粍ID
+ ///</summary>
[SugarColumn(ColumnName = "qc_teamid")]
public string? QcTeamid { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
+ /// 鐗╂枡ID
+ ///</summary>
[SugarColumn(ColumnName = "item_id")]
public long? ItemId { get; set; }
/// <summary>
- /// 棰滆壊
- /// </summary>
+ /// 棰滆壊
+ ///</summary>
[SugarColumn(ColumnName = "color_name")]
public string? ColorName { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
+ /// 鍒涘缓缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+
+ /// <summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "FSubsidiary")]
public string? FSubsidiary { get; set; }
/// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DATA_TYPE")]
+ public string? DataType { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
-
-
- /// <summary>
- /// 浠撶鍛�
- /// </summary>
- [SugarColumn(ColumnName = "F_WPVT_BASE_QTR")]
- public string? F_WPVT_BASE_QTR { get; set; }
- /// <summary>
- /// 搴忓垪鍙风敓鎴愭椂鏈�
- /// </summary>
- [SugarColumn(ColumnName = "FSNCREATETIME")]
- public string? FSNCREATETIME { get; set; }
- /// <summary>
- /// 涓氬姟鑼冨洿
- /// </summary>
- [SugarColumn(ColumnName = "FSNMANAGETYPE")]
- public string? FSNMANAGETYPE { get; set; }
- /// <summary>
- /// 搴撳瓨绠＄悊
- /// </summary>
- [SugarColumn(ColumnName = "FISSNMANAGE")]
- public string? FISSNMANAGE { get; set; }
- /// <summary>
- /// 鐢熶骇杩芥函
- /// </summary>
- [SugarColumn(ColumnName = "FISSNPRDTRACY")]
- public string? FISSNPRDTRACY { get; set; }
- /// <summary>
- /// 搴忓垪鍙峰崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "FSNUNIT")]
- public string? FSNUNIT { get; set; }
- /// <summary>
- /// 鍒堕�犵瓥鐣�
- /// </summary>
- [SugarColumn(ColumnName = "FMfgPolicyId")]
- public string? FMfgPolicyId { get; set; }
- /// <summary>
- /// 鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
- /// <summary>
- /// 鏄惁鍏抽敭浠�
- /// </summary>
- [SugarColumn(ColumnName = "FIsKitting")]
- public string? FIsKitting { get; set; }
- /// <summary>
- /// 鍙负鑱斿壇浜у搧
- /// </summary>
- [SugarColumn(ColumnName = "FIsCoby")]
- public string? FIsCoby { get; set; }
- /// <summary>
- /// 瓒呭彂鎺у埗鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "FOverControlMode")]
- public string? FOverControlMode { get; set; }
- /// <summary>
- /// 鎹熻�楃巼
- /// </summary>
- [SugarColumn(ColumnName = "FLOSSPERCENT")]
- public string? FLOSSPERCENT { get; set; }
- /// <summary>
- /// 淇濊川鏈�
- /// </summary>
- [SugarColumn(ColumnName = "FExpPeriod")]
- public string? FExpPeriod { get; set; }
- /// <summary>
- /// 鏃х墿鏂欑紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FOldNumber")]
- public string? FOldNumber { get; set; }
- /// <summary>
- /// 鏈�灏忓簱瀛�
- /// </summary>
- [SugarColumn(ColumnName = "FMinStock")]
- public string? FMinStock { get; set; }
- /// <summary>
- /// 鍏ュ簱娆犳敹姣斾緥(%)
- /// </summary>
- [SugarColumn(ColumnName = "FFinishReceiptShortRate")]
- public string? FFinishReceiptShortRate { get; set; }
-
- /// <summary>
- /// 榛樿渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "FDefaultVendor")]
- public string? FDefaultVendor { get; set; }
- /// <summary>
- /// 瀛愰」鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FBOMUnitId")]
- public string? FBOMUnitId { get; set; }
-
-
-}
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesPosition.cs b/MES.Service/Modes/MesPosition.cs
index 443578b..ad17a0d 100644
--- a/MES.Service/Modes/MesPosition.cs
+++ b/MES.Service/Modes/MesPosition.cs
@@ -9,107 +9,107 @@
public class MesPosition
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 宀椾綅缂栧彿
- /// </summary>
+ /// 宀椾綅缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "position_id")]
public string? PositionId { get; set; }
/// <summary>
- /// 宀椾綅鍚嶇О
- /// </summary>
+ /// 宀椾綅鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "position_name")]
public string? PositionName { get; set; }
/// <summary>
- /// 宀椾綅鎻忚堪
- /// </summary>
+ /// 宀椾綅鎻忚堪
+ ///</summary>
[SugarColumn(ColumnName = "position_description")]
public string? PositionDescription { get; set; }
/// <summary>
- /// 鎵�灞為儴闂�
- /// </summary>
+ /// 鎵�灞為儴闂�
+ ///</summary>
[SugarColumn(ColumnName = "department")]
public string? Department { get; set; }
/// <summary>
- /// 寤虹珛鏃ユ湡
- /// </summary>
+ /// 寤虹珛鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "creation_date")]
public DateTime? CreationDate { get; set; }
/// <summary>
- /// 绂佺敤浜�
- /// </summary>
+ /// 绂佺敤浜�
+ ///</summary>
[SugarColumn(ColumnName = "disabled_by")]
public string? DisabledBy { get; set; }
/// <summary>
- /// 绂佺敤鏃ユ湡
- /// </summary>
+ /// 绂佺敤鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "disabled_date")]
public DateTime? DisabledDate { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "remark1")]
public string? Remark1 { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "remark2")]
public string? Remark2 { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "remark3")]
public string? Remark3 { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "fforbidstatus")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSUBSIDIARY")]
- public string? FUseOrgId { get; set; }
+ /// 鍒涘缓缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
/// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FUMBRELLA")]
- public string? FCreateOrgId { get; set; }
+ /// 浣跨敤缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 2d42d2b..c436289 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -9,149 +9,156 @@
public class MesStaff
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// ID
- /// </summary>
+ /// ID
+ ///</summary>
[SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 鍛樺伐缂栫爜
- /// </summary>
+ /// 鍛樺伐缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "staff_no")]
public string? StaffNo { get; set; }
/// <summary>
- /// 鍛樺伐濮撳悕
- /// </summary>
+ /// 鍛樺伐濮撳悕
+ ///</summary>
[SugarColumn(ColumnName = "staff_name")]
public string? StaffName { get; set; }
/// <summary>
- /// 閮ㄩ棬缂栫爜
- /// </summary>
+ /// 閮ㄩ棬缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "department_no")]
public string? DepartmentNo { get; set; }
/// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
+ /// 閮ㄩ棬鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "department_name")]
public string? DepartmentName { get; set; }
/// <summary>
- /// 宀椾綅缂栫爜
- /// </summary>
+ /// 宀椾綅缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "position_code")]
public string? PositionCode { get; set; }
/// <summary>
- /// 宀椾綅鍚嶇О
- /// </summary>
+ /// 宀椾綅鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "position_name")]
public string? PositionName { get; set; }
/// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
+ /// 鎵嬫満鍙�
+ ///</summary>
[SugarColumn(ColumnName = "phone_number")]
public string? PhoneNumber { get; set; }
/// <summary>
- /// 浠诲矖寮�濮嬫棩鏈�
- /// </summary>
+ /// 浠诲矖寮�濮嬫棩鏈�
+ ///</summary>
[SugarColumn(ColumnName = "start_date")]
public DateTime? StartDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "remark")]
public string? Remark { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
[SugarColumn(ColumnName = "remark3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
[SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
[SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
+ /// 鍒涘缓浜�
+ ///</summary>
[SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏇存柊浜�
- /// </summary>
+ /// 鏇存柊浜�
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
+ /// 鏇存柊鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "memo")]
public string? Memo { get; set; }
/// <summary>
- /// 鐢熶骇绾�
- /// </summary>
+ /// 鐢熶骇绾�
+ ///</summary>
[SugarColumn(ColumnName = "line_no")]
public string? LineNo { get; set; }
/// <summary>
- /// 鐢熶骇鍛樺伐鏍囪瘑
- /// 榛樿鍊�: ((1))
- /// </summary>
+ /// 鐢熶骇鍛樺伐鏍囪瘑
+ /// 榛樿鍊�: ((1))
+ ///</summary>
[SugarColumn(ColumnName = "work_mk")]
public int? WorkMk { get; set; }
/// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
+ /// 鏄惁绂佺敤
+ ///</summary>
[SugarColumn(ColumnName = "fforbid_status")]
public string? FforbidStatus { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- /// </summary>
+ /// 鍒涘缓缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "Fumbrella")]
public string? Fumbrella { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- /// </summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "FSubsidiary")]
public string? FSubsidiary { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DATA_TYPE")]
+ public string? DataType { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSupplier.cs b/MES.Service/Modes/MesSupplier.cs
index 952d20d..6ef30ec 100644
--- a/MES.Service/Modes/MesSupplier.cs
+++ b/MES.Service/Modes/MesSupplier.cs
@@ -9,190 +9,183 @@
public class MesSupplier
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// ID
- /// </summary>
+ /// ID
+ ///</summary>
[SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ ///</summary>
[SugarColumn(ColumnName = "supp_no")]
public string? SuppNo { get; set; }
/// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
+ /// 渚涘簲鍟嗗悕绉�
+ ///</summary>
[SugarColumn(ColumnName = "supp_name")]
public string? SuppName { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙畝绉�
- /// </summary>
+ /// 渚涘簲鍟嗙畝绉�
+ ///</summary>
[SugarColumn(ColumnName = "supp_sname")]
public string? SuppSname { get; set; }
/// <summary>
- /// 鍦板尯
- /// </summary>
+ /// 鍦板尯
+ ///</summary>
[SugarColumn(ColumnName = "land1")]
public string? Land1 { get; set; }
/// <summary>
- /// 鍦板潃
- /// </summary>
+ /// 鍦板潃
+ ///</summary>
[SugarColumn(ColumnName = "stras")]
public string? Stras { get; set; }
/// <summary>
- /// 鐢佃瘽
- /// </summary>
+ /// 鐢佃瘽
+ ///</summary>
[SugarColumn(ColumnName = "telf1")]
public string? Telf1 { get; set; }
/// <summary>
- /// 浼犵湡
- /// </summary>
+ /// 浼犵湡
+ ///</summary>
[SugarColumn(ColumnName = "telfx")]
public string? Telfx { get; set; }
/// <summary>
- /// 璁板綍鍒涘缓浜�
- /// </summary>
+ /// 璁板綍鍒涘缓浜�
+ ///</summary>
[SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�杩戞洿鏂颁汉
- /// </summary>
+ /// 鏈�杩戞洿鏂颁汉
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�杩戞洿鏂版椂闂�
- /// </summary>
+ /// 鏈�杩戞洿鏂版椂闂�
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "remark")]
public string? Remark { get; set; }
/// <summary>
- /// 绠�鐮�(鎵撳嵃鏉＄爜鐢�)
- /// </summary>
+ /// 绠�鐮�(鎵撳嵃鏉＄爜鐢�)
+ ///</summary>
[SugarColumn(ColumnName = "fscode")]
public string? Fscode { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
+ /// 鍏徃浠ｇ爜
+ ///</summary>
[SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
+ /// 鍒嗗巶缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 鐗╂枡鏄惁鍏辩(鏄紝鍚�)
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鐗╂枡鏄惁鍏辩(鏄紝鍚�)
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "item_c")]
public int? ItemC { get; set; }
/// <summary>
- /// 鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�)
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�)
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "item_sap")]
public int? ItemSap { get; set; }
/// <summary>
- /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "lot_flag")]
public int? LotFlag { get; set; }
/// <summary>
- /// 鑱旂郴浜�
- /// </summary>
+ /// 鑱旂郴浜�
+ ///</summary>
[SugarColumn(ColumnName = "lxr")]
public string? Lxr { get; set; }
/// <summary>
- /// 璐熻矗浜�
- /// </summary>
+ /// 璐熻矗浜�
+ ///</summary>
[SugarColumn(ColumnName = "fstaffid")]
public string? Fstaffid { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "fforbidstatus")]
public string? Fforbidstatus { get; set; }
+
/// <summary>
- /// 鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
[SugarColumn(ColumnName = "remark3")]
public string? Remark3 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
[SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
[SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 浣跨敤缁勭粐
- /// </summary>
+ /// 鍒涘缓缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "Fumbrella")]
+ public string? Fumbrella { get; set; }
+
+ /// <summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "FSubsidiary")]
public string? FSubsidiary { get; set; }
/// <summary>
- /// 鍒涘缓缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
-
+ /// 鏁版嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DATA_TYPE")]
+ public string? DataType { get; set; }
-
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
-
- /// <summary>
- /// 渚涘簲绫诲埆
- /// </summary>
- [SugarColumn(ColumnName = "FSUPPLYCLASSIFY")]
- public string? FSUPPLYCLASSIFY { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesUnit.cs b/MES.Service/Modes/MesUnit.cs
index 598c9d6..9ea8e2a 100644
--- a/MES.Service/Modes/MesUnit.cs
+++ b/MES.Service/Modes/MesUnit.cs
@@ -9,141 +9,149 @@
public class MesUnit
{
/// <summary>
- /// BASEINFO
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
+
+ /// <summary>
+ /// BASEINFO
+ ///</summary>
+ [SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 鍘熷崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "OLDUNIT")]
+ /// 鍘熷崟浣�
+ ///</summary>
+ [SugarColumn(ColumnName = "oldunit")]
public string? Oldunit { get; set; }
/// <summary>
- /// 鐩殑鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "NEWUNIT")]
+ /// 鐩殑鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "newunit")]
public string? Newunit { get; set; }
/// <summary>
- /// 鍘熷崟浣嶆暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "OLDQTY")]
- public decimal? Oldqty { get; set; }
+ /// 鍘熷崟浣嶆暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "oldqty")]
+ public int? Oldqty { get; set; }
/// <summary>
- /// 鐩殑鍗曚綅鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "NEWQTY")]
- public decimal? Newqty { get; set; }
+ /// 鐩殑鍗曚綅鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "newqty")]
+ public int? Newqty { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+ [SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FNUMBER")]
+ /// 缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "fnumber")]
public string? Fnumber { get; set; }
/// <summary>
- /// 鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "FNAME")]
+ /// 鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "fname")]
public string? Fname { get; set; }
/// <summary>
- /// 鎵�灞炵粍鍒�
- /// </summary>
- [SugarColumn(ColumnName = "FUNITGROUPID")]
+ /// 鎵�灞炵粍鍒�
+ ///</summary>
+ [SugarColumn(ColumnName = "funitgroupid")]
public string? Funitgroupid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗘瘝
- /// </summary>
- [SugarColumn(ColumnName = "FCONVERTDENOMINATOR")]
- public double? Fconvertdenominator { get; set; }
+ /// 鎹㈢畻鍒嗘瘝
+ ///</summary>
+ [SugarColumn(ColumnName = "fconvertdenominator")]
+ public decimal? Fconvertdenominator { get; set; }
/// <summary>
- /// 褰撳墠鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FCURRENTUNITID")]
+ /// 褰撳墠鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "fcurrentunitid")]
public string? Fcurrentunitid { get; set; }
/// <summary>
- /// 鎹㈢畻鍒嗗瓙
- /// </summary>
- [SugarColumn(ColumnName = "FCONVERTNUMERATOR")]
- public double? Fconvertnumerator { get; set; }
+ /// 鎹㈢畻鍒嗗瓙
+ ///</summary>
+ [SugarColumn(ColumnName = "fconvertnumerator")]
+ public decimal? Fconvertnumerator { get; set; }
/// <summary>
- /// 鍩哄噯鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FBASEUNIT")]
+ /// 鍩哄噯鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "fbaseunit")]
public string? Fbaseunit { get; set; }
/// <summary>
- /// 鑸嶅叆绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "FROUNDTYPE")]
+ /// 鑸嶅叆绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "froundtype")]
public string? Froundtype { get; set; }
/// <summary>
- /// 绮惧害
- /// </summary>
- [SugarColumn(ColumnName = "FPRECISION")]
- public decimal? Fprecision { get; set; }
+ /// 绮惧害
+ ///</summary>
+ [SugarColumn(ColumnName = "fprecision")]
+ public int? Fprecision { get; set; }
/// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "FDESCRIPTION")]
+ /// 鎻忚堪
+ ///</summary>
+ [SugarColumn(ColumnName = "fdescription")]
public string? Fdescription { get; set; }
/// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
+ /// 绂佺敤鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "fforbidstatus")]
public string? Fforbidstatus { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
/// <summary>
- /// 鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
-
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "DATA_TYPE")]
+ public string? DataType { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index 9a18e92..f209d1f 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -9,171 +9,184 @@
public class SysDepartment
{
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 鍏徃
- /// </summary>
+ /// 鍏徃
+ ///</summary>
[SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// 閮ㄩ棬ID
- /// </summary>
+ /// 閮ㄩ棬ID
+ ///</summary>
[SugarColumn(ColumnName = "departmentid")]
public decimal? Departmentid { get; set; }
/// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
+ /// 閮ㄩ棬缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "departmentcode")]
public string? Departmentcode { get; set; }
/// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
+ /// 閮ㄩ棬鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "departmentname")]
public string? Departmentname { get; set; }
/// <summary>
- /// 閮ㄩ棬灞炴��
- /// </summary>
+ /// 閮ㄩ棬灞炴��
+ ///</summary>
[SugarColumn(ColumnName = "depextr1")]
public string? Depextr1 { get; set; }
/// <summary>
- /// 閮ㄩ棬鍒嗙粍
- /// </summary>
+ /// 閮ㄩ棬鍒嗙粍
+ ///</summary>
[SugarColumn(ColumnName = "depextr2")]
public string? Depextr2 { get; set; }
/// <summary>
- /// WIP浠撳簱
- /// </summary>
+ /// WIP浠撳簱
+ ///</summary>
[SugarColumn(ColumnName = "depextr3")]
public string? Depextr3 { get; set; }
/// <summary>
- /// 鏄惁绂佺敤 A 鍚敤 B绂佺敤
- /// </summary>
+ /// 鏄惁绂佺敤 A 鍚敤 B绂佺敤
+ ///</summary>
[SugarColumn(ColumnName = "depextr4")]
public string? Depextr4 { get; set; }
/// <summary>
- /// 閮ㄩ棬鎵╁睍瀛楁5
- /// </summary>
+ /// 閮ㄩ棬鎵╁睍瀛楁5
+ ///</summary>
[SugarColumn(ColumnName = "depextr5")]
public string? Depextr5 { get; set; }
/// <summary>
- /// 杞﹂棿ID
- /// </summary>
+ /// 杞﹂棿ID
+ ///</summary>
[SugarColumn(ColumnName = "workshop_no")]
public string? WorkshopNo { get; set; }
/// <summary>
- /// 杞﹂棿鍚�
- /// </summary>
+ /// 杞﹂棿鍚�
+ ///</summary>
[SugarColumn(ColumnName = "workshop_name")]
public string? WorkshopName { get; set; }
/// <summary>
- /// 閮ㄩ棬缁忕悊
- /// </summary>
+ /// 閮ㄩ棬缁忕悊
+ ///</summary>
[SugarColumn(ColumnName = "fmanager")]
public string? Fmanager { get; set; }
/// <summary>
- /// 宸ュ巶
- /// </summary>
+ /// 宸ュ巶
+ ///</summary>
[SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
+ /// 鍒涘缓浜�
+ ///</summary>
[SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
+ /// 鍒涘缓鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庝慨鏀逛汉
- /// </summary>
+ /// 鏈�鍚庝慨鏀逛汉
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庝慨鏀规棩鏈�
- /// </summary>
+ /// 鏈�鍚庝慨鏀规棩鏈�
+ ///</summary>
[SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "remark")]
public string? Remark { get; set; }
/// <summary>
- /// </summary>
+ /// 閮ㄩ棬id
+ ///</summary>
[SugarColumn(ColumnName = "id")]
public decimal Id { get; set; }
/// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
[SugarColumn(ColumnName = "production_workshop")]
public string? ProductionWorkshop { get; set; }
/// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
+ /// 鐗╂枡灞炴��
+ ///</summary>
[SugarColumn(ColumnName = "material_properti")]
public string? MaterialProperti { get; set; }
-
/// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
[SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
[SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
+ /// 鍒涘缓缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "Fumbrella")]
public string? Fumbrella { get; set; }
/// <summary>
- /// 涓婄骇閮ㄩ棬
- /// </summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "FSubsidiary")]
+ public string? FSubsidiary { get; set; }
+
+ /// <summary>
+ /// 涓婄骇閮ㄩ棬
+ ///</summary>
[SugarColumn(ColumnName = "FParentID")]
public string? FParentID { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
/// <summary>
- /// 鏁版嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FDocumentStatus")]
- public string? FDocumentStatus { get; set; }
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "check_date")]
+ public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "check_by")]
+ public string? CheckBy { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "check_status")]
+ public bool? CheckStatus { 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 4fd7e79..260f7be 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -115,19 +115,34 @@
private MesCustomer GetSysDepartment(ErpCustomer customer)
{
//ERP鍌宠几鐨勬帴鍙ｆ暩鎿氳綁鎻涚偤MES鏁告摎搴瓧娈�
+ var fForbidStatus = customer.FForbidStatus;
+ if (customer.FForbidStatus == "0")
+ {
+ fForbidStatus = "A";
+ }
+ else if (customer.FForbidStatus == "1")
+ {
+ fForbidStatus = "B";
+ }
return new MesCustomer
{
- Id = Convert.ToDecimal(customer.Id),
+ Id = string.IsNullOrEmpty(customer.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(customer.Id),
CustNo = customer.FNumber,
CustSname = customer.FShortName,
CustName = customer.FName,
Anred = customer.FTContact,
Telf1 = customer.Fmobilephone,
Fseller = customer.Fseller,
- Fforbidstatus = customer.FForbidStatus,
- FSubsidiary = customer.FUseOrgId,
- Fumbrella = customer.FCreateOrgId,
+ Fforbidstatus = fForbidStatus,
+ FSubsidiary = string.IsNullOrEmpty(customer.FUseOrgId)
+ ? "1"
+ : customer.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(customer.FCreateOrgId)
+ ? "1"
+ : customer.FCreateOrgId,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index b6088d9..d89e904 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -42,7 +42,7 @@
}
// 鏇存柊浠撳簱鐘舵�佺殑鏂规硶
- private bool UpdateDepotStatus(SqlSugarScope db, decimal depotId,
+ private bool UpdateDepotStatus(SqlSugarScope db, long depotId,
string status)
{
var result = db.Updateable<MesDepots>()
@@ -91,27 +91,28 @@
{
return new MesDepots
{
- Guid = depots.Id,
DepotCode = depots.FNumber,
DepotName = depots.FName,
- DepotId = Convert.ToDecimal(depots.Id),
+ DepotId = string.IsNullOrEmpty(depots.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : long.Parse(depots.Id),
IsFkc = depots.FAllowMinusQty,
CreateBy = depots.FPrincipal,
Depottype = depots.FStockProperty,
IsNg = depots.FForbidStatus,
Zuid = depots.FGroup,
- FSubsidiary = depots.FUseOrgId,
- Fumbrella = depots.FCreateOrgId,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- SupplierId = depots.FSUPPLIERID,
- Company = "1000",
- Factory = "1000",
- FCustomerId = depots.FCustomerId,
- FDocumentStatus = depots.FDocumentStatus,
- FStockStatusType = depots.FStockStatusType
-
+ DocumentStatus = depots.FDocumentStatus,
+ UseOrg = string.IsNullOrEmpty(depots.FUseOrgId)
+ ? 1
+ : long.Parse(depots.FUseOrgId),
+ CreateOrg = string.IsNullOrEmpty(depots.FCreateOrgId)
+ ? 1
+ : long.Parse(depots.FCreateOrgId),
+ CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ LastupdateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Company = "1000",
+ Factory = "1000"
};
}
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index a5191ba..6f74c23 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -50,7 +50,7 @@
throw new NotImplementedException("鎻掑叆澶辫触");
}
- private bool DeleteItemType(decimal id)
+ private bool DeleteItemType(long? id)
{
var deleteById = Db.Deleteable<MesItemType>()
.Where(it => it.Id == id).ExecuteCommand();
@@ -64,7 +64,9 @@
{
return new MesItemType
{
- Id = Convert.ToDecimal(department.Id),
+ Id = string.IsNullOrEmpty(department.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : long.Parse(department.Id),
Pgroup = department.FParentId,
Tcode = department.FNumber,
Tname = department.FName,
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index b4a7084..301b4f8 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -115,47 +115,43 @@
{
return new MesItems
{
- Id = Convert.ToDecimal(item.Id),
+ Id = string.IsNullOrEmpty(item.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : long.Parse(item.Id),
Type = item.Type,
ItemNo = item.FNumber,
- FOldNumber = item.FOldNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
ItemUnit = item.FBaseUnitId,
- Lowlimit = Convert.ToDouble(item.FSafeStock),
- Highlimit = Convert.ToDouble(item.FMaxStock),
- FMinStock = item.FMinStock,
- PrdPack = Convert.ToDouble(item.FMinPackCount),
+ Lowlimit = !string.IsNullOrEmpty(item.FSafeStock) ? Convert.ToDecimal(item.FSafeStock) : null,
+ Highlimit = !string.IsNullOrEmpty(item.FMaxStock) ? Convert.ToDecimal(item.FMaxStock) : null,
+ PrdPack = !string.IsNullOrEmpty(item.FMinPackCount) ? Convert.ToDecimal(item.FMinPackCount) : null,
DepotCode = item.FStockId,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
- Ffinishreceiptoverrate = Convert.ToDecimal(item.FFinishReceiptOverRate),
- FFinishReceiptShortRate = item.FFinishReceiptShortRate,
+ Ffinishreceiptoverrate = !string.IsNullOrEmpty(item.FFinishReceiptOverRate) ? Convert.ToInt32(item.FFinishReceiptOverRate) : null,
Fissuetype = item.FIssueType,
- Fisbatchmanage = Convert.ToInt32(item.FIsBatchManage),
+ Fisbatchmanage = !string.IsNullOrEmpty(item.FIsBatchManage) ? Convert.ToInt32(item.FIsBatchManage) : null,
Fpurchaserid = item.FPurchaserId,
- FDefaultVendor = item.FDefaultVendor,
- Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
+ Fpurchaseunitid = item.FPurchaseUnitId,
Storeunit = item.FStoreUnitID,
Saleunit = item.FSaleUnitId,
- FDocumentStatus = item.FDocumentStatus,
Fforbidstatus = item.FForbidStatus,
MaterialProperti = item.FErpClsID,
- FMfgPolicyId = item.FMfgPolicyId,
ProductionWorkshop = item.FWorkShopId,
- FBOMUnitId = item.FBOMUnitId,
ProduceUnit = item.FPRODUCEUNITID,
- FIsKitting = item.FIsKitting,
- FIsCoby = item.FIsCoby,
- FOverControlMode = item.FOverControlMode,
SubconUnit = item.FSUBCONUNITID,
- Fumbrella = item.FCreateOrgId,
- FSubsidiary = item.FUseOrgId,
- FLOSSPERCENT = item.FLOSSPERCENT,
+ FSubsidiary = string.IsNullOrEmpty(item.FUseOrgId)
+ ? "1"
+ : item.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(item.FCreateOrgId)
+ ? "1"
+ : item.FCreateOrgId,
+ LossPercent = item.FLOSSPERCENT,
MnemonicCode = item.FMnemonicCode,
- FExpPeriod = item.FExpPeriod,
- EItemId = long.Parse(item.Id),
- ItemId = long.Parse(item.Id),
+ ExpPeriod = item.FExpPeriod,
+ EItemId = !string.IsNullOrEmpty(item.Id) ? long.Parse(item.Id) : null,
+ ItemId = !string.IsNullOrEmpty(item.Id) ? long.Parse(item.Id) : null,
LastupdateDate = DateTime.Now,
CreateDate = DateTime.Now,
Company = "1000",
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index 03a25e3..1a008bb 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -82,14 +82,20 @@
{
return new MesPosition
{
- Id = Convert.ToDecimal(position.Id),
+ Id = string.IsNullOrEmpty(position.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(position.Id),
PositionId = position.FNumber,
PositionName = position.FName,
PositionDescription = position.FDESCRIPTIONS,
Department = position.FDept,
Fforbidstatus = position.FForbidStatus,
- FUseOrgId = position.FUseOrgId,
- FCreateOrgId = position.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(position.FUseOrgId)
+ ? "1"
+ : position.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(position.FCreateOrgId)
+ ? "1"
+ : position.FCreateOrgId,
CreationDate = position.FCreateDate != null
? DateTime.ParseExact(position.FCreateDate,
"yyyy-MM-dd HH:mm:ss", null)
@@ -99,7 +105,6 @@
? DateTime.ParseExact(position.FForbidDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- FDocumentStatus = position.FDocumentStatus
};
}
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index e54dd91..d25ad5e 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -585,7 +585,9 @@
{
var entity = new MesStaff
{
- Id = Convert.ToDecimal(staff.Id),
+ Id = string.IsNullOrEmpty(staff.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(staff.Id),
StaffNo = staff.FStaffNumber,
StaffName = staff.FName,
DepartmentName = staff.FPostDept,
@@ -593,8 +595,12 @@
PhoneNumber = staff.FMobile,
Remark = staff.FDescription,
FforbidStatus = staff.FForbidStatus,
- FSubsidiary = staff.FUseOrgId,
- Fumbrella = staff.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(staff.FUseOrgId)
+ ? "1"
+ : staff.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(staff.FCreateOrgId)
+ ? "1"
+ : staff.FCreateOrgId,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Type = staff.Type
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 57983a5..022fb52 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -116,7 +116,9 @@
{
return new MesSupplier
{
- Id = Convert.ToDecimal(supplier.Id),
+ Id = string.IsNullOrEmpty(supplier.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(supplier.Id),
Type = supplier.Type,
SuppNo = supplier.FNumber,
SuppSname = supplier.FShortName,
@@ -124,16 +126,18 @@
Lxr = supplier.FTContact,
Telf1 = supplier.Fmobilephone,
Fstaffid = supplier.FStaffId,
- FDocumentStatus = supplier.FDocumentStatus,
Fforbidstatus = supplier.FForbidStatus,
- FSubsidiary = supplier.FUseOrgId,
- Fumbrella = supplier.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
+ ? "1"
+ : supplier.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
+ ? "1"
+ : supplier.FCreateOrgId,
Remark = supplier.Remark,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000",
-
};
}
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 4157420..74f8467 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -112,26 +112,38 @@
private MesUnit GetMesUnit(ErpUnit unit)
{
+
+ var fForbidStatus = unit.FForbidStatus;
+ if (unit.FForbidStatus == "0")
+ {
+ fForbidStatus = "A";
+ }
+ else if (unit.FForbidStatus == "1")
+ {
+ fForbidStatus = "B";
+ }
+
return new MesUnit
{
- Id = Convert.ToDecimal(unit.Id),
+ Id = string.IsNullOrEmpty(unit.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(unit.Id),
Fnumber = unit.FNumber,
Fname = unit.FName,
Funitgroupid = unit.FUnitGroupId,
- Fconvertdenominator = Convert.ToDouble(unit.FConvertDenominator),
+ Fconvertdenominator = Convert.ToDecimal(unit.FConvertDenominator),
Fcurrentunitid = unit.FCurrentUnitId,
- Fconvertnumerator = unit.FConvertNumerator,
+ Fconvertnumerator = Convert.ToDecimal(unit.FConvertNumerator),
Fbaseunit = unit.FBaseUnit,
Froundtype = unit.FRoundType,
Fprecision = unit.FPrecision,
Fdescription = unit.FDescription,
- Fforbidstatus = unit.FForbidStatus,
+ Fforbidstatus = fForbidStatus,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000",
- Type = unit.Type,
- FDocumentStatus = unit.FDocumentStatus
+ Type = unit.Type
};
}
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 4537867..25f3b0f 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -94,24 +94,41 @@
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
private SysDepartment GetSysDepartment(ErpDepartment department)
{
+ var unixTimeSeconds = string.IsNullOrEmpty(department.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(department.Id);
+
+ var fForbidStatus = department.FForbidStatus;
+ if (department.FForbidStatus == "0")
+ {
+ fForbidStatus = "A";
+ }
+ else if (department.FForbidStatus == "1")
+ {
+ fForbidStatus = "B";
+ }
+
return new SysDepartment
{
Departmentcode = department.FNumber,
Departmentname = department.FName,
- Departmentid = Convert.ToDecimal(department.Id),
- Id = Convert.ToDecimal(department.Id),
+ Departmentid = unixTimeSeconds,
+ Id = unixTimeSeconds,
Depextr1 = department.FDeptProperty,
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
- Depextr4 = department.FForbidStatus,
+ Depextr4 = fForbidStatus,
FParentID = department.FParentID,
- FSubsidiary = department.FUseOrgId,
- Fumbrella = department.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(department.FUseOrgId)
+ ? "1"
+ : department.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(department.FCreateOrgId)
+ ? "1"
+ : department.FCreateOrgId,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000",
- FDocumentStatus = department.FDocumentStatus
+ Factory = "1000"
};
}
@@ -209,7 +226,7 @@
private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
List<SysDepartment> departmentList)
{
- return departmentList.All(
- entity => InsertOrUpdateDepartment(db, entity));
+ return departmentList.All(entity =>
+ InsertOrUpdateDepartment(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3