From 29e5727404f1c34af7b0f9b80c0876e6eeb4b91c Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 02 四月 2025 16:34:55 +0800 Subject: [PATCH] 上架修改调用完接口再保存 --- Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 84 ++++++++++++++++++++++++++++++++--------- 1 files changed, 65 insertions(+), 19 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs index f575a44..620fcad 100644 --- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs +++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs @@ -48,10 +48,15 @@ /// </summary> [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")] public int STATUS { get; set; } - /// <summary> - /// 鐗╂枡缂栫爜 - /// </summary> - [DisplayName("鐗╂枡缂栫爜")] + /// <summary> + /// 鏄惁鍑嗗瀹屾垚(Y/N) + /// </summary> + [DisplayName("鏄惁鍑嗗瀹屾垚(Y/N)")] + public string IS_READY { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [DisplayName("鐗╂枡缂栫爜")] public string ITEM_CODE { get; set; } /// <summary> /// 鐗╂枡绫诲瀷 @@ -103,10 +108,15 @@ /// </summary> [DisplayName("瀹為檯绾夸綋")] public string ACT_LINE { get; set; } - /// <summary> - /// 璁″垝寮�濮嬫椂闂� - /// </summary> - [DisplayName("璁″垝寮�濮嬫椂闂�")] + /// <summary> + /// 璁″垝鏃ユ湡 + /// </summary> + [DisplayName("璁″垝鏃ユ湡")] + public string PLAN_DATE { get; set; } + /// <summary> + /// 璁″垝寮�濮嬫椂闂� + /// </summary> + [DisplayName("璁″垝寮�濮嬫椂闂�")] public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue; /// <summary> /// 璁″垝缁撴潫鏃堕棿 @@ -183,10 +193,15 @@ /// </summary> [DisplayName("鍏ュ簱鏁伴噺")] public int STOCK_IN_QTY { get; set; } - /// <summary> - /// UPH - /// </summary> - [DisplayName("UPH")] + /// <summary> + /// 棣栦欢纭鏁伴噺 + /// </summary> + [DisplayName("棣栦欢纭鏁伴噺")] + public int FIRST_IN_QTY { get; set; } + /// <summary> + /// UPH + /// </summary> + [DisplayName("UPH")] public double UPH { get; set; } /// <summary> /// UPPH @@ -198,6 +213,31 @@ /// </summary> [DisplayName("閿�鍞鍗�")] public string SALES_ORDER { get; set; } + /// <summary> + /// 閿�鍞悎鍚屽彿 + /// </summary> + [DisplayName("閿�鍞悎鍚屽彿")] + public string SALES_CONTRACT { get; set; } + /// <summary> + /// 閿�鍞鍗曞娉� + /// </summary> + [DisplayName("閿�鍞鍗曞娉�")] + public string SALES_REMARK { get; set; } + /// <summary> + /// 宸ュ崟搴忓垪鍙� + /// </summary> + [DisplayName("宸ュ崟搴忓垪鍙�")] + public string SERIAL_NO { get; set; } + /// <summary> + /// 鍘傚唴鏉$爜鍓嶇紑 + /// </summary> + [DisplayName("鍘傚唴鏉$爜鍓嶇紑")] + public string SN_PREFIX { get; set; } + /// <summary> + /// 瀹㈡埛鏉$爜鍓嶇紑 + /// </summary> + [DisplayName("瀹㈡埛鏉$爜鍓嶇紑")] + public string CUST_PREFIX { get; set; } /// <summary> /// 鏈�鍚庣殑宸ュ崟鍘嗗彶ID /// </summary> @@ -225,6 +265,10 @@ [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ + [SugarColumn(IsIgnore = true)] + public string CUST_NAME => Customer?.CUST_NAME_CN; + [SugarColumn(IsIgnore = true)] + public string WS_NAME => WorkShop?.WS_NAME; #endregion #region 澶栭敭灞炴�� @@ -245,10 +289,12 @@ 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 + [Navigate(NavigateType.OneToOne, nameof(WS_CODE), nameof(MES_WORKSHOP.WS_CODE), "GHOST_ROW = 0")] + public MES_WORKSHOP WorkShop { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + #endregion - #region 鏋氫妇鍙橀噺 - /*渚嬪瓙 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { [Description("鏋氫妇鎻忚堪0")] @@ -258,10 +304,10 @@ } */ - /// <summary> - /// 鏋氫妇锛氬伐鍗曠被鍨�(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏) - /// </summary> - public enum ORDER_TYPEs + /// <summary> + /// 鏋氫妇锛氬伐鍗曠被鍨�(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏) + /// </summary> + public enum ORDER_TYPEs { [Description("璁″垝")] Plan = 0, -- Gitblit v1.9.3