From c7327ce93612f6023b94982b4596ad4786567580 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期三, 08 一月 2025 21:42:28 +0800 Subject: [PATCH] 新增属性和导航属性,调整枚举变量位置 --- Tiger.Business.MES/iERP/U9C_MES.cs | 1 + Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs index be930b5..b1cd759 100644 --- a/Tiger.Business.MES/iERP/U9C_MES.cs +++ b/Tiger.Business.MES/iERP/U9C_MES.cs @@ -561,6 +561,7 @@ UPDATE_TIME = di["ModifiedOn"].ToDateTime(), PLAN_START_TIME = di["CreatedOn"].ToDateTime(), STATUS = 0, + WS_CODE = di["DepartmentName"] == null ? "" : di["DepartmentName"].ToString(), AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(), SALES_ORDER = di["SrcDoc_SrcDocNo"] == null ? "" : di["SrcDoc_SrcDocNo"].ToString(), SALES_REMARK = di["SoLineMemo"] == null ? "" : di["SoLineMemo"].ToString(), diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs index 0987246..620fcad 100644 --- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs +++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs @@ -265,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 澶栭敭灞炴�� @@ -285,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")] @@ -298,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