From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期日, 27 十月 2024 14:12:32 +0800 Subject: [PATCH] Merge branch 'master' into master_ben --- Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs index 6e20e7b..dff689f 100644 --- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs +++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs @@ -39,6 +39,11 @@ [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")] public int STATUS { get; set; } /// <summary> + /// 鏄惁鍑嗗瀹屾垚(Y/N) + /// </summary> + [DisplayName("鏄惁鍑嗗瀹屾垚(Y/N)")] + public string IS_READY { get; set; } + /// <summary> /// 鐗╂枡缂栫爜 /// </summary> [DisplayName("鐗╂枡缂栫爜")] @@ -119,6 +124,11 @@ [DisplayName("鍏ュ簱鏁伴噺")] public int STOCK_IN_QTY { get; set; } /// <summary> + /// 棣栦欢纭鏁伴噺 + /// </summary> + [DisplayName("棣栦欢纭鏁伴噺")] + public int FIRST_IN_QTY { get; set; } + /// <summary> /// UPH /// </summary> [DisplayName("UPH")] @@ -156,7 +166,10 @@ */ [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁 public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + [SugarColumn(IsIgnore = true)] public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG); + [Navigate(NavigateType.OneToOne, nameof(CUST_CODE), nameof(BAS_CUSTOMER.CUST_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁 + public BAS_CUSTOMER Customer { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull #endregion #region 鏋氫妇鍙橀噺 -- Gitblit v1.9.3