From 2df22d081aa4d3677b474962e9bbc38db8efa536 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 24 三月 2025 17:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs | 176 +++++++++++++++++++++++-----------------------------------
1 files changed, 71 insertions(+), 105 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs
index b6441f0..b39a1d8 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs
@@ -10,105 +10,94 @@
/// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("璋冩嫧鍗�(WMS)")]
[Serializable]
[SugarTable("BIZ_WMS_TRANSFER")]
public class BIZ_WMS_TRANSFER : DbEntityWithAuth
{
#region 鏋勯�犲嚱鏁�
-
/// <summary>
/// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)
/// </summary>
- public BIZ_WMS_TRANSFER()
- { }
-
- #endregion 鏋勯�犲嚱鏁�
+ public BIZ_WMS_TRANSFER() { }
+ #endregion
#region 鍏叡灞炴��
-
/// <summary>
- /// 鍗曟嵁浠ｇ爜
+ /// 璋冩嫧鍗曞彿
/// </summary>
- public string BILLCODE { get; set; }
-
+ [DisplayName("璋冩嫧鍗曞彿")]
+ public string ORDER_NO { get; set; }
/// <summary>
/// 鍗曟嵁鏃ユ湡
/// </summary>
- public DateTime BILLDATE { get; set; } = DateTime.MinValue;
-
+ [DisplayName("鍗曟嵁鏃ユ湡")]
+ public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
/// <summary>
- /// 鍗曟嵁鐘舵��
+ /// 鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)
/// </summary>
+ [DisplayName("鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)")]
public int STATUS { get; set; }
-
/// <summary>
- /// 涓氬姟绫诲瀷
+ /// 璋冨嚭浠撳簱
/// </summary>
- public string BIZTYPE { get; set; }
-
+ [DisplayName("璋冨嚭浠撳簱")]
+ public string OUT_WH_CODE { get; set; }
/// <summary>
- /// 鍑哄簱浠撳簱浠ｇ爜
+ /// 鎷ㄥ叆浠撳簱
/// </summary>
- public string OUTWAREHOUSECODE { get; set; }
-
+ [DisplayName("鎷ㄥ叆浠撳簱")]
+ public string IN_WH_CODE { get; set; }
/// <summary>
- /// 鍏ュ簱搴撲粨搴撲唬鐮�
+ /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�
/// </summary>
- public string INWAREHOUSECODE { get; set; }
-
+ [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�")]
+ public string SOURCE_CODE { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁绫诲瀷
+ /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲
/// </summary>
- public int SOURCETYPE { get; set; }
-
+ [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")]
+ public string SOURCE_ORDER { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁浠ｇ爜
+ /// ERP鍗曟嵁鍙风爜
/// </summary>
- public string SOURCECODE { get; set; }
-
+ [DisplayName("ERP鍗曟嵁鍙风爜")]
+ public string ERP_ORDER { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
-
- /// <summary>
- /// ERP鍗曟嵁浠ｇ爜
- /// </summary>
- public string ERP_BILL_CODE { get; set; }
-
/// <summary>
/// -1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
/// </summary>
+ [DisplayName("-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟")]
public int HANDLED { get; set; }
-
/// <summary>
/// 鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
/// </summary>
+ [DisplayName("鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�")]
public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
-
/// <summary>
/// 杩囪处鎻愪氦鐨凧SON
/// </summary>
+ [DisplayName("杩囪处鎻愪氦鐨凧SON")]
public string COMMIT_JSON { get; set; }
-
/// <summary>
/// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
/// </summary>
+ [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")]
public string COMMIT_MSG { get; set; }
-
- #endregion 鍏叡灞炴��
+ #endregion
#region 铏氭嫙灞炴��
-
/*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
-
- #endregion 铏氭嫙灞炴��
+ #endregion
#region 澶栭敭灞炴��
-
/*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_TRANSFER绫婚噷闈㈢殑澶栭敭ID瀛楁
@@ -121,13 +110,13 @@
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_DTL.BILLCODE), nameof(BILLCODE))]
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_DTL.ORDER_NO), nameof(ORDER_NO))]
public List<BIZ_WMS_TRANSFER_DTL> DtlsWithGhost { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
public List<BIZ_WMS_TRANSFER_DTL> Dtls => DtlsWithGhost?.Where(q => !q.GHOST_ROW).ToList();
- [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_SN.BILLCODE), nameof(BILLCODE))]
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_SN.ORDER_NO), nameof(ORDER_NO))]
public List<BIZ_WMS_TRANSFER_SN> SnListWithGhost { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
@@ -136,73 +125,50 @@
#endregion 澶栭敭灞炴��
#region 鏋氫妇鍙橀噺
-
/*渚嬪瓙
- public enum FieldNames
- {
- [Description("鏋氫妇鎻忚堪0")]
- Enum0,
- [Description("鏋氫妇鎻忚堪1")]
- Enum1,
- }
- */
-
+ public enum FieldNames
+ {
+ [Description("鏋氫妇鎻忚堪0")]
+ Enum0,
+ [Description("鏋氫妇鎻忚堪1")]
+ Enum1,
+ }
+ */
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)
+ /// </summary>
public enum STATUSs
{
- /// <summary>
- ///
- /// </summary>
- [Description("鎵嬪伐鏂板")]
- MANUAL = -1,
-
- /// <summary>
- ///
- /// </summary>
- [Description("鏂板")]
- INIT,
-
- /// <summary>
- ///
- /// </summary>
- [Description("浣滀笟涓�")]
- WORKING,
-
- /// <summary>
- ///
- /// </summary>
- [Description("瀹屾垚")]
- COMPLETE,
-
- /// <summary>
- /// 棰嗘枡鍗曚富鍔ㄨ皟鎷ㄨ繃璐︾姸鎬�
- /// </summary>
- [Description("璋冩嫧瀹屾垚")]
- FINISHED,
-
- /// <summary>
- /// 鎵嬪姩涓嬫灦瀹屾垚
- /// </summary>
- [Description("鎵嬪姩涓嬫灦瀹屾垚")]
- MANUALCOMPLETE,
-
- /// <summary>
- /// 璋冨嚭
- /// </summary>
- [Description("璋冨嚭")]
- OUTERCOMPLETE,
+ [Description("鏂板垱寤�")]
+ Init = 0,
+ [Description("宸插鍏�")]
+ Imported = 1,
+ [Description("寰呮崱鏂�")]
+ WaitPick = 2,
+ [Description("鎹℃枡涓�")]
+ Picking = 3,
+ [Description("宸叉崱瀹�")]
+ Picked = 4,
+ [Description("宸茶皟鍑�")]
+ Sended = 5,
+ [Description("宸查�佽揪")]
+ Arrived = 6,
+ [Description("娓呯偣涓�")]
+ Counting = 7,
+ [Description("妫�楠屼腑")]
+ InQC = 8,
+ [Description("涓婃灦涓�")]
+ Storing = 9,
+ [Description("宸插畬鎴�")]
+ Finished = 10,
+ [Description("浣滃簾")]
+ Cancel = 11,
}
-
- #endregion 鏋氫妇鍙橀噺
+ #endregion
#region 鍏叡鏂规硶
- public static List<string> strongHoldList = new List<string>
- {
- "XCSJ",
- "DGXC",
- "AHXC"
- };
+ #endregion
- #endregion 鍏叡鏂规硶
}//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3