From 10081828bf4b88b01a63bde072118bfdb582a28e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 12 九月 2025 19:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/Modes/MesDepots.cs | 160 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 99 insertions(+), 61 deletions(-)
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index da16258..877c158 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -15,195 +15,233 @@
public Guid Guid { get; set; }
/// <summary>
- /// ID(SEQ_INV_ID)
+ /// 浠撳簱ID
///</summary>
- [SugarColumn(ColumnName = "DEPOT_ID")]
- public long DepotId { get; set; }
+ [SugarColumn(ColumnName = "depot_id")]
+ public decimal DepotId { get; set; }
/// <summary>
- /// 浠撳簱绫诲埆缂栫爜
+ /// 浠撳簱缂栫爜
///</summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
+ [SugarColumn(ColumnName = "depot_code")]
public string? DepotCode { get; set; }
/// <summary>
- /// 浠撳簱绫诲埆鍚嶇О
+ /// 浠撳簱鍚嶇О
///</summary>
- [SugarColumn(ColumnName = "DEPOT_NAME")]
+ [SugarColumn(ColumnName = "depot_name")]
public string? DepotName { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
- [SugarColumn(ColumnName = "DESCRIPTION")]
+ [SugarColumn(ColumnName = "description")]
public string? Description { get; set; }
/// <summary>
/// 浠撳簱璐熻矗浜�
///</summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ [SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
+ [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")]
- public string? LastupdateDate { get; set; }
+ [SugarColumn(ColumnName = "lastupdate_date")]
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 浠撳簱绫诲瀷
///</summary>
- [SugarColumn(ColumnName = "DEPOTTYPE")]
+ [SugarColumn(ColumnName = "depottype")]
public string? Depottype { get; set; }
/// <summary>
/// 鍒嗗巶缂栫爜
///</summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ [SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
/// 鐗╂枡浣跨敤
/// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName = "TYPE_1")]
- public long? Type1 { get; set; }
+ [SugarColumn(ColumnName = "type_1")]
+ public int? Type1 { get; set; }
/// <summary>
/// 鎴愬搧浣跨敤
/// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName = "TYPE_2")]
- public long? Type2 { get; set; }
+ [SugarColumn(ColumnName = "type_2")]
+ public int? Type2 { get; set; }
/// <summary>
/// 浠撳簱绫诲瀷缂栫爜
///</summary>
- [SugarColumn(ColumnName = "DEPOTTYPECODE")]
- public long? Depottypecode { get; set; }
+ [SugarColumn(ColumnName = "depottypecode")]
+ public int? Depottypecode { get; set; }
/// <summary>
/// 鍏徃浠ｇ爜
///</summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ [SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
/// 鐪嬫澘鍥炬爣鏍峰紡
///</summary>
- [SugarColumn(ColumnName = "ICON_TYPE")]
- public long? IconType { get; set; }
+ [SugarColumn(ColumnName = "icon_type")]
+ public int? IconType { get; set; }
/// <summary>
/// 鏄惁濮斿浠撳簱
/// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName = "IS_WY")]
- public long? IsWy { get; set; }
+ [SugarColumn(ColumnName = "is_wy")]
+ public int? IsWy { get; set; }
/// <summary>
- /// 鏄惁涓嶈壇鍝佷粨
- /// 榛樿鍊�: ('0')
+ /// 绂佺敤鐘舵��
+ /// 榛樿鍊�: ((0))
///</summary>
- [SugarColumn(ColumnName = "IS_NG")]
+ [SugarColumn(ColumnName = "is_ng")]
public string? IsNg { get; set; }
/// <summary>
/// 浠撳簱鍦板潃
///</summary>
- [SugarColumn(ColumnName = "CWHADDRESS")]
+ [SugarColumn(ColumnName = "cwhaddress")]
public string? Cwhaddress { get; set; }
/// <summary>
/// 鐪嬫澘鏄剧ず鍖哄煙缂栧彿
- /// 榛樿鍊�: ('1')
+ /// 榛樿鍊�: ((1))
///</summary>
- [SugarColumn(ColumnName = "PI_TYPE")]
+ [SugarColumn(ColumnName = "pi_type")]
public string? PiType { get; set; }
/// <summary>
/// 鍒嗙粍
///</summary>
- [SugarColumn(ColumnName = "ZUID")]
+ [SugarColumn(ColumnName = "zuid")]
public string? Zuid { get; set; }
/// <summary>
/// 鍏佽鍗虫椂搴撳瓨璐熷簱瀛�
///</summary>
- [SugarColumn(ColumnName = "IS_FKC")]
+ [SugarColumn(ColumnName = "is_fkc")]
public string? IsFkc { get; set; }
/// <summary>
/// 鐢熶骇杞﹂棿
///</summary>
- [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
+ [SugarColumn(ColumnName = "production_workshop")]
public string? ProductionWorkshop { get; set; }
/// <summary>
- /// 0=鏅�氫粨,1=闇插ぉ浠�,2=瀵勫浠�,3=澶栧瘎浠�,4=鍦ㄥ埗鍝侊紝5=鎶ュ簾
+ /// 鐗╂枡灞炴��
///</summary>
- [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
+ [SugarColumn(ColumnName = "material_properti")]
public string? MaterialProperti { get; set; }
-
- /// <summary>
- /// 鍒涘缓缁勭粐
- ///</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")]
+ [SugarColumn(ColumnName = "remark3")]
public string? Remark3 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�4
///</summary>
- [SugarColumn(ColumnName = "REMARK4")]
+ [SugarColumn(ColumnName = "remark4")]
public string? Remark4 { get; set; }
/// <summary>
- /// 鑷畾涔夊瓧娈�5
+ /// 鑷畾涔夊瓧娈�5锛屼粨搴撳睘鎬�
///</summary>
- [SugarColumn(ColumnName = "REMARK5")]
+ [SugarColumn(ColumnName = "remark5")]
public string? Remark5 { get; set; }
/// <summary>
- /// 0 =涓嶇敓鏁堬紝 1=鐢熸晥
+ ///
///</summary>
- [SugarColumn(ColumnName = "FORBID_STATUS")]
- public string? ForbidStatus { get; set; }
+ [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>
+ /// 鍒涘缓缁勭粐
+ ///</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>
+ /// Z=鏆傚瓨,A=鍒涘缓,B=瀹℃牳涓�,C=宸插鏍�,D=閲嶆柊瀹℃牳
///</summary>
[SugarColumn(ColumnName = "DOCUMENT_STATUS")]
public string? DocumentStatus { get; set; }
/// <summary>
- /// 鎵瑰彿绠＄悊
+ /// 0=鍙敤,4=鍦ㄩ��,6=搴熷搧,2=鍐荤粨,5=鏀惰揣鍐荤粨,1=寰呮,8=涓嶅弬涓庢牳绠�,3=閫�鍥炲喕缁�,7=涓嶈壇
///</summary>
- [SugarColumn(ColumnName = "IS_LOT")]
- public string? IsLot { get; set; }
+ [SugarColumn(ColumnName = "STOCK_STATUS_TYPE")]
+ public string? StockStatusType { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3