From beca28ecb3a730ffb33c21e0c55c729774725faf Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 25 四月 2025 16:51:28 +0800
Subject: [PATCH] 优化备料单发料逻辑
---
Tiger.Model.Net/Entitys/WMS/WMS_ITEM_POOL.cs | 240 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 164 insertions(+), 76 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_POOL.cs b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_POOL.cs
index f4a0660..72c1180 100644
--- a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_POOL.cs
+++ b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_POOL.cs
@@ -10,101 +10,155 @@
/// 瀹炰綋锛氬鏂欏簱瀛樻睜
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("澶囨枡搴撳瓨姹�")]
[Serializable]
[SugarTable("WMS_ITEM_POOL")]
public class WMS_ITEM_POOL : DbEntityNoGhostWithAuth
- {
+ {
#region 鏋勯�犲嚱鏁�
/// <summary>
/// 瀹炰綋锛氬鏂欏簱瀛樻睜
/// </summary>
public WMS_ITEM_POOL() {}
- #endregion
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 涓氬姟鍗曟嵁缂栫爜
- /// </summary>
- public string TRANS_CODE { get; set; }
- /// <summary>
- /// 涓氬姟鍗曟嵁鍙风爜
- /// </summary>
- public string TRANS_NO { get; set; }
- /// <summary>
- /// 涓氬姟鍗曟嵁琛屽彿
- /// </summary>
- public string TRANS_LINE { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曟嵁缂栫爜
- /// </summary>
- public string SOURCE_CODE { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曟嵁鍙风爜
- /// </summary>
- public string SOURCE_ORDER { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曟嵁琛屽彿
- /// </summary>
- public string SOURCE_LINE { get; set; }
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 浜嬪姟ID
+ /// </summary>
+ [DisplayName("浜嬪姟ID")]
+ public string TRANS_ID { get; set; }
+ /// <summary>
+ /// 涓氬姟鍗曟嵁缂栫爜
+ /// </summary>
+ [DisplayName("涓氬姟鍗曟嵁缂栫爜")]
+ public string TRANS_CODE { get; set; }
+ /// <summary>
+ /// 涓氬姟鍗曟嵁鍙风爜
+ /// </summary>
+ [DisplayName("涓氬姟鍗曟嵁鍙风爜")]
+ public string TRANS_NO { get; set; }
+ /// <summary>
+ /// 涓氬姟鍗曟嵁琛屽彿
+ /// </summary>
+ [DisplayName("涓氬姟鍗曟嵁琛屽彿")]
+ public string TRANS_LINE { get; set; }
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁缂栫爜
+ /// </summary>
+ [DisplayName("鏉ユ簮鍗曟嵁缂栫爜")]
+ public string SOURCE_CODE { get; set; }
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁鍙风爜
+ /// </summary>
+ [DisplayName("鏉ユ簮鍗曟嵁鍙风爜")]
+ public string SOURCE_ORDER { get; set; }
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁琛屽彿
+ /// </summary>
+ [DisplayName("鏉ユ簮鍗曟嵁琛屽彿")]
+ public string SOURCE_LINE { get; set; }
+ /// <summary>
+ /// 澶囨枡绛栫暐锛堜綅鏍囧織鏋氫妇锛�(0None涓嶅惎鐢▅1FIFO鍏堣繘鍏堝嚭|2FSFO/灏炬暟浼樺厛)
+ /// </summary>
+ [DisplayName("澶囨枡绛栫暐锛堜綅鏍囧織鏋氫妇锛�(0None涓嶅惎鐢▅1FIFO鍏堣繘鍏堝嚭|2FSFO/灏炬暟浼樺厛)")]
+ public int STRATEGY { get; set; }
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡(0Supply姝ｅ父鍙戞枡|1First棣栧鍙戞枡)
+ /// </summary>
+ [DisplayName("鍙戞枡鏂瑰紡(0Supply姝ｅ父鍙戞枡|1First棣栧鍙戞枡)")]
+ public int DLVY_MODE { get; set; }
+ /// <summary>
+ /// 鏄惁琚攣瀹�(Y/N)锛岄攣瀹氬垯涓嶅厑璁稿叾浠栦簨鍔″垎閰嶅綋鍓嶇墿鏂�
+ /// </summary>
+ [DisplayName("鏄惁琚攣瀹�(Y/N)锛岄攣瀹氬垯涓嶅厑璁稿叾浠栦簨鍔″垎閰嶅綋鍓嶇墿鏂�")]
+ public string IS_LOCKED { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
public string ITEM_CODE { get; set; }
/// <summary>
/// 鐗╂枡鏉＄爜
/// </summary>
+ [DisplayName("鐗╂枡鏉＄爜")]
public string SN { get; set; }
/// <summary>
/// 鐗╂枡鏁伴噺
/// </summary>
+ [DisplayName("鐗╂枡鏁伴噺")]
public double QTY { get; set; }
/// <summary>
/// 宸插垎閰嶆暟閲�
/// </summary>
+ [DisplayName("宸插垎閰嶆暟閲�")]
public double ALLOC_QTY { get; set; }
- /// <summary>
+ /// <summary>
/// 鐢熶骇鏃ユ湡
/// </summary>
+ [DisplayName("鐢熶骇鏃ユ湡")]
public DateTime PROD_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鍌ㄤ綅ID
- /// </summary>
- public string LOCATION_ID { get; set; }
- /// <summary>
- /// 鏄惁棣栧鏂�(Y/N)
- /// </summary>
- public string IS_FIRST { get; set; }
+ /// <summary>
+ /// 浠撳簱ID
+ /// </summary>
+ [DisplayName("浠撳簱ID")]
+ public string WH_ID { get; set; }
+ /// <summary>
+ /// 鍌ㄥ尯ID
+ /// </summary>
+ [DisplayName("鍌ㄥ尯ID")]
+ public string REGION_ID { get; set; }
+ /// <summary>
+ /// 璐ф灦/鏂欒溅ID
+ /// </summary>
+ [DisplayName("璐ф灦/鏂欒溅ID")]
+ public string SHELF_ID { get; set; }
+ /// <summary>
+ /// 鍌ㄤ綅ID
+ /// </summary>
+ [DisplayName("鍌ㄤ綅ID")]
+ public string LOCATION_ID { get; set; }
+ /// <summary>
+ /// 鏄惁棣栧鏂�(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁棣栧鏂�(Y/N)")]
+ public string IS_FIRST { get; set; }
/// <summary>
/// 鍒嗛厤鐘舵��(0AllAllocated鍏ㄩ儴鍒嗛厤|1PartialAllocate閮ㄥ垎鍒嗛厤)
/// </summary>
+ [DisplayName("鍒嗛厤鐘舵��(0AllAllocated鍏ㄩ儴鍒嗛厤|1PartialAllocate閮ㄥ垎鍒嗛厤)")]
public int ALLOC_MODE { get; set; }
/// <summary>
/// 鐘舵��(0WaitPick寰呮崱鏂檤1Picking鎹℃枡涓瓅2WaitSend寰呭彂鏂檤3Sended宸插彂鏂檤4Close宸插叧闂瓅5Cancel浣滃簾)
/// </summary>
+ [DisplayName("鐘舵��(0WaitPick寰呮崱鏂檤1Picking鎹℃枡涓瓅2WaitSend寰呭彂鏂檤3Sended宸插彂鏂檤4Close宸插叧闂瓅5Cancel浣滃簾)")]
public int STATUS { get; set; }
/// <summary>
/// 鍔犲伐娈�
/// </summary>
+ [DisplayName("鍔犲伐娈�")]
public string SEGMENT { get; set; }
/// <summary>
- /// 鐩爣浜х嚎浠ｇ爜
+ /// 鐩爣浜х嚎缂栫爜
/// </summary>
+ [DisplayName("鐩爣浜х嚎缂栫爜")]
public string LINE_CODE { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疻MS_ITEM_POOL绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -115,43 +169,77 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.WMS_ITEM_POOLId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /// <summary>
- /// 鍒嗛厤鐘舵��(0AllAllocated鍏ㄩ儴鍒嗛厤|1PartialAllocate閮ㄥ垎鍒嗛厤)
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
+ public enum FieldNames
+ {
+ [Description("鏋氫妇鎻忚堪0")]
+ Enum0,
+ [Description("鏋氫妇鎻忚堪1")]
+ Enum1,
+ }
+ */
+
+ /// <summary>
+ /// 鏋氫妇锛氬鏂欑瓥鐣ワ紙浣嶆爣蹇楁灇涓撅級(0None涓嶅惎鐢▅1FIFO鍏堣繘鍏堝嚭|2FSFO/灏炬暟浼樺厛)
/// </summary>
- public enum ALLOC_MODEs
- {
- [Description("鍏ㄩ儴鍒嗛厤")]
- AllAllocated,
- [Description("閮ㄥ垎鍒嗛厤")]
- PartialAllocate,
- }
+ public enum STRATEGYs
+ {
+ [Description("涓嶅惎鐢�")]
+ None = 0,
+ [Description("鍏堣繘鍏堝嚭")]
+ FIFO = 1,
+ [Description("灏炬暟浼樺厛")]
+ FSFO = 2,
+ }
- /// <summary>
- /// 鐘舵��(0WaitPick寰呮崱鏂檤1Picking鎹℃枡涓瓅2WaitSend寰呭彂鏂檤3Sended宸插彂鏂檤4Close宸插叧闂瓅5Cancel浣滃簾)
- /// </summary>
- public enum STATUSs
- {
- [Description("寰呮崱鏂�")]
- WaitPick,
- [Description("鎹℃枡涓�")]
- Picking,
- [Description("寰呭彂鏂�")]
- WaitSend,
- [Description("宸插彂鏂�")]
- Sended,
- [Description("宸插叧闂�")]
- Close,
- [Description("浣滃簾")]
- Cancel,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氬彂鏂欐柟寮�(0Supply姝ｅ父鍙戞枡|1First棣栧鍙戞枡)
+ /// </summary>
+ public enum DLVY_MODEs
+ {
+ [Description("姝ｅ父鍙戞枡")]
+ Supply = 0,
+ [Description("棣栧鍙戞枡")]
+ First = 1,
+ }
- #region 鍏叡鏂规硶
+ /// <summary>
+ /// 鏋氫妇锛氬垎閰嶇姸鎬�(0AllAllocated鍏ㄩ儴鍒嗛厤|1PartialAllocate閮ㄥ垎鍒嗛厤)
+ /// </summary>
+ public enum ALLOC_MODEs
+ {
+ [Description("鍏ㄩ儴鍒嗛厤")]
+ AllAllocated = 0,
+ [Description("閮ㄥ垎鍒嗛厤")]
+ PartialAllocate = 1,
+ }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0WaitPick寰呮崱鏂檤1Picking鎹℃枡涓瓅2WaitSend寰呭彂鏂檤3Sended宸插彂鏂檤4Close宸插叧闂瓅5Cancel浣滃簾)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("寰呮崱鏂�")]
+ WaitPick = 0,
+ [Description("鎹℃枡涓�")]
+ Picking = 1,
+ [Description("寰呭彂鏂�")]
+ WaitSend = 2,
+ [Description("宸插彂鏂�")]
+ Sended = 3,
+ [Description("宸插叧闂�")]
+ Close = 4,
+ [Description("浣滃簾")]
+ Cancel = 5,
+ }
+ #endregion
- }//endClass
+ #region 鍏叡鏂规硶
+
+ #endregion
+
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3