From ee6076f44f8d2edafe8066a47cfde8863469b8ee Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期六, 15 三月 2025 15:10:36 +0800 Subject: [PATCH] 更新U9实体 --- Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 520 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 291 insertions(+), 229 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs index ad5aeda..620fcad 100644 --- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs +++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs @@ -6,193 +6,238 @@ namespace Tiger.Model { - /// <summary> - /// 瀹炰綋锛氬伐鍗� - /// </summary> - [Description("Primary:ID")] - [DisplayName("宸ュ崟")] - [Serializable] - [SugarTable("BIZ_MES_WO")] - public class BIZ_MES_WO : DbEntityWithAuth - { - #region 鏋勯�犲嚱鏁� - /// <summary> - /// 瀹炰綋锛氬伐鍗� - /// </summary> - public BIZ_MES_WO() { } - #endregion + /// <summary> + /// 瀹炰綋锛氬伐鍗� + /// </summary> + [Description("Primary:ID")] + [DisplayName("宸ュ崟")] + [Serializable] + [SugarTable("BIZ_MES_WO")] + public class BIZ_MES_WO : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛氬伐鍗� + /// </summary> + public BIZ_MES_WO() {} + #endregion - #region 鍏叡灞炴�� + #region 鍏叡灞炴�� + /// <summary> + /// 宸ュ崟鍙� + /// </summary> + [DisplayName("宸ュ崟鍙�")] + public string ORDER_NO { get; set; } + /// <summary> + /// 宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏) + /// </summary> + [DisplayName("宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)")] + public int ORDER_TYPE { get; set; } + /// <summary> + /// 宸ュ崟鎻忚堪 + /// </summary> + [DisplayName("宸ュ崟鎻忚堪")] + public string ORDER_DESC { get; set; } + /// <summary> + /// 鐖跺伐鍗� + /// </summary> + [DisplayName("鐖跺伐鍗�")] + public string PARENT_ORDER { get; set; } + /// <summary> + /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�) + /// </summary> + [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")] + public int STATUS { get; set; } /// <summary> - /// 宸ュ崟鍙� + /// 鏄惁鍑嗗瀹屾垚(Y/N) /// </summary> - [DisplayName("宸ュ崟鍙�")] - public string ORDER_NO { get; set; } - /// <summary> - /// 宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5濮斿Outsourcing|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏) - /// </summary> - [DisplayName("宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)")] - public string ORDER_TYPE { get; set; } - /// <summary> - /// 宸ュ崟鎻忚堪 - /// </summary> - [DisplayName("宸ュ崟鎻忚堪")] - public string ORDER_DESC { get; set; } - /// <summary> - /// 鐖跺伐鍗� - /// </summary> - [DisplayName("鐖跺伐鍗�")] - public string PARENT_ORDER { get; set; } - /// <summary> - /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�) - /// </summary> - [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")] - public int STATUS { get; set; } + [DisplayName("鏄惁鍑嗗瀹屾垚(Y/N)")] + public string IS_READY { get; set; } /// <summary> /// 鐗╂枡缂栫爜 /// </summary> [DisplayName("鐗╂枡缂栫爜")] - public string ITEM_CODE { get; set; } + public string ITEM_CODE { get; set; } + /// <summary> + /// 鐗╂枡绫诲瀷 + /// </summary> + [DisplayName("鐗╂枡绫诲瀷")] + public string ITEM_TYPE { get; set; } + /// <summary> + /// 鏈哄瀷 + /// </summary> + [DisplayName("鏈哄瀷")] + public string ITEM_MODEL { get; set; } + /// <summary> + /// 浼樺厛绾� + /// </summary> + [DisplayName("浼樺厛绾�")] + public string PRIORITY { get; set; } + /// <summary> + /// 瀹㈡埛缂栫爜 + /// </summary> + [DisplayName("瀹㈡埛缂栫爜")] + public string CUST_CODE { get; set; } + /// <summary> + /// 璺敱缂栫爜 + /// </summary> + [DisplayName("璺敱缂栫爜")] + public string ROUTE_CODE { get; set; } + /// <summary> + /// 宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴) + /// </summary> + [DisplayName("宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)")] + public int ROUTE_STATUS { get; set; } + /// <summary> + /// 宸ュ巶 + /// </summary> + [DisplayName("宸ュ巶")] + public string FACTORY { get; set; } + /// <summary> + /// 杞﹂棿缂栫爜 + /// </summary> + [DisplayName("杞﹂棿缂栫爜")] + public string WS_CODE { get; set; } + /// <summary> + /// 璁″垝绾夸綋 + /// </summary> + [DisplayName("璁″垝绾夸綋")] + public string PLAN_LINE { get; set; } + /// <summary> + /// 瀹為檯绾夸綋 + /// </summary> + [DisplayName("瀹為檯绾夸綋")] + public string ACT_LINE { get; set; } /// <summary> - /// 鐗╂枡绫诲瀷 + /// 璁″垝鏃ユ湡 /// </summary> - [DisplayName("鐗╂枡绫诲瀷")] - public string ITEM_TYPE { get; set; } - /// <summary> - /// 鏈哄瀷 - /// </summary> - [DisplayName("鏈哄瀷")] - public string ITEM_MODEL { get; set; } - /// <summary> - /// 浼樺厛绾� - /// </summary> - [DisplayName("浼樺厛绾�")] - public string PRIORITY { get; set; } - /// <summary> - /// 瀹㈡埛缂栫爜 - /// </summary> - [DisplayName("瀹㈡埛缂栫爜")] - public string CUST_CODE { get; set; } - /// <summary> - /// 璺敱缂栫爜 - /// </summary> - [DisplayName("璺敱缂栫爜")] - public string ROUTE_CODE { get; set; } - /// <summary> - /// 宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴) - /// </summary> - [DisplayName("宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)")] - public int ROUTE_STATUS { get; set; } - /// <summary> - /// 宸ュ巶 - /// </summary> - [DisplayName("宸ュ巶")] - public string FACTORY { get; set; } - /// <summary> - /// 杞﹂棿缂栫爜 - /// </summary> - [DisplayName("杞﹂棿缂栫爜")] - public string WS_CODE { get; set; } - /// <summary> - /// 璁″垝绾夸綋 - /// </summary> - [DisplayName("璁″垝绾夸綋")] - public string PLAN_LINE { get; set; } - /// <summary> - /// 瀹為檯绾夸綋 - /// </summary> - [DisplayName("瀹為檯绾夸綋")] - public string ACT_LINE { get; set; } + [DisplayName("璁″垝鏃ユ湡")] + public string PLAN_DATE { get; set; } /// <summary> /// 璁″垝寮�濮嬫椂闂� /// </summary> [DisplayName("璁″垝寮�濮嬫椂闂�")] - public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue; + public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 璁″垝缁撴潫鏃堕棿 + /// </summary> + [DisplayName("璁″垝缁撴潫鏃堕棿")] + public DateTime PLAN_END_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 瀹為檯寮�濮嬫椂闂� + /// </summary> + [DisplayName("瀹為檯寮�濮嬫椂闂�")] + public DateTime ACT_START_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 瀹為檯缁撴潫鏃堕棿 + /// </summary> + [DisplayName("瀹為檯缁撴潫鏃堕棿")] + public DateTime ACT_END_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 鏍囧噯浣滀笟浜烘暟 + /// </summary> + [DisplayName("鏍囧噯浣滀笟浜烘暟")] + public int STD_WORKER_QTY { get; set; } + /// <summary> + /// 瀹為檯浣滀笟浜烘暟 + /// </summary> + [DisplayName("瀹為檯浣滀笟浜烘暟")] + public int ACT_WORKER_QTY { get; set; } + /// <summary> + /// 瀵煎叆鏃堕棿 + /// </summary> + [DisplayName("瀵煎叆鏃堕棿")] + public DateTime IMPORT_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 涓嬪彂鏃堕棿 + /// </summary> + [DisplayName("涓嬪彂鏃堕棿")] + public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 涓嬪彂浜� + /// </summary> + [DisplayName("涓嬪彂浜�")] + public string RELEASE_USER { get; set; } + /// <summary> + /// 鍙樻洿鏃堕棿 + /// </summary> + [DisplayName("鍙樻洿鏃堕棿")] + public DateTime CHANGE_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 鍙樻洿浜� + /// </summary> + [DisplayName("鍙樻洿浜�")] + public string CHANGE_USER { get; set; } + /// <summary> + /// 璁″垝鏁伴噺 + /// </summary> + [DisplayName("璁″垝鏁伴噺")] + public int PLAN_QTY { get; set; } + /// <summary> + /// 鎶曞叆鏁伴噺 + /// </summary> + [DisplayName("鎶曞叆鏁伴噺")] + public int INPUT_QTY { get; set; } + /// <summary> + /// 瀹屽伐鏁伴噺 + /// </summary> + [DisplayName("瀹屽伐鏁伴噺")] + public int OUTPUT_QTY { get; set; } + /// <summary> + /// 鎶ュ簾鏁伴噺 + /// </summary> + [DisplayName("鎶ュ簾鏁伴噺")] + public int SCRAP_QTY { get; set; } + /// <summary> + /// 鍏ュ簱鏁伴噺 + /// </summary> + [DisplayName("鍏ュ簱鏁伴噺")] + public int STOCK_IN_QTY { get; set; } /// <summary> - /// 璁″垝缁撴潫鏃堕棿 + /// 棣栦欢纭鏁伴噺 /// </summary> - [DisplayName("璁″垝缁撴潫鏃堕棿")] - public DateTime PLAN_END_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 瀹為檯寮�濮嬫椂闂� - /// </summary> - [DisplayName("瀹為檯寮�濮嬫椂闂�")] - public DateTime ACT_START_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 瀹為檯缁撴潫鏃堕棿 - /// </summary> - [DisplayName("瀹為檯缁撴潫鏃堕棿")] - public DateTime ACT_END_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 鏍囧噯浣滀笟浜烘暟 - /// </summary> - [DisplayName("鏍囧噯浣滀笟浜烘暟")] - public int STD_WORKER_QTY { get; set; } - /// <summary> - /// 瀹為檯浣滀笟浜烘暟 - /// </summary> - [DisplayName("瀹為檯浣滀笟浜烘暟")] - public int ACT_WORKER_QTY { get; set; } - /// <summary> - /// 瀵煎叆鏃堕棿 - /// </summary> - [DisplayName("瀵煎叆鏃堕棿")] - public DateTime IMPORT_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 涓嬪彂鏃堕棿 - /// </summary> - [DisplayName("涓嬪彂鏃堕棿")] - public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 涓嬪彂浜� - /// </summary> - [DisplayName("涓嬪彂浜�")] - public string RELEASE_USER { get; set; } - /// <summary> - /// 鍙樻洿鏃堕棿 - /// </summary> - [DisplayName("鍙樻洿鏃堕棿")] - public DateTime CHANGE_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 鍙樻洿浜� - /// </summary> - [DisplayName("鍙樻洿浜�")] - public string CHANGE_USER { get; set; } - /// <summary> - /// 璁″垝鏁伴噺 - /// </summary> - [DisplayName("璁″垝鏁伴噺")] - public int PLAN_QTY { get; set; } - /// <summary> - /// 鎶曞叆鏁伴噺 - /// </summary> - [DisplayName("鎶曞叆鏁伴噺")] - public int INPUT_QTY { get; set; } - /// <summary> - /// 瀹屽伐鏁伴噺 - /// </summary> - [DisplayName("瀹屽伐鏁伴噺")] - public int OUTPUT_QTY { get; set; } - /// <summary> - /// 鎶ュ簾鏁伴噺 - /// </summary> - [DisplayName("鎶ュ簾鏁伴噺")] - public int SCRAP_QTY { get; set; } - /// <summary> - /// 鍏ュ簱鏁伴噺 - /// </summary> - [DisplayName("鍏ュ簱鏁伴噺")] - public int STOCK_IN_QTY { get; set; } + [DisplayName("棣栦欢纭鏁伴噺")] + public int FIRST_IN_QTY { get; set; } /// <summary> /// UPH /// </summary> [DisplayName("UPH")] - public double UPH { get; set; } + public double UPH { get; set; } + /// <summary> + /// UPPH + /// </summary> + [DisplayName("UPPH")] + public double UPPH { get; set; } /// <summary> - /// UPPH + /// 閿�鍞鍗� /// </summary> - [DisplayName("UPPH")] - public double UPPH { get; set; } + [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> @@ -202,17 +247,17 @@ /// 澶囨敞 /// </summary> [DisplayName("澶囨敞")] - public string REMARK { get; set; } - /// <summary> - /// 鎺ュ彛琛ㄨ褰旾D - /// </summary> - [DisplayName("鎺ュ彛琛ㄨ褰旾D")] - public string FBILLNO_ID { get; set; } - /// <summary> - /// 澶囨枡鍗曡繑鍥炰俊鎭� - /// </summary> - [DisplayName("澶囨枡鍗曡繑鍥炰俊鎭�")] - public string PREP_MSG { get; set; } + public string REMARK { get; set; } + /// <summary> + /// 鎺ュ彛琛ㄨ褰旾D + /// </summary> + [DisplayName("鎺ュ彛琛ㄨ褰旾D")] + public string FBILLNO_ID { get; set; } + /// <summary> + /// 澶囨枡鍗曡繑鍥炰俊鎭� + /// </summary> + [DisplayName("澶囨枡鍗曡繑鍥炰俊鎭�")] + public string PREP_MSG { get; set; } #endregion #region 铏氭嫙灞炴�� @@ -220,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 澶栭敭灞炴�� @@ -234,6 +283,14 @@ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WOId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ + [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭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 + [Navigate(NavigateType.OneToOne, nameof(WS_CODE), nameof(MES_WORKSHOP.WS_CODE), "GHOST_ROW = 0")] + public MES_WORKSHOP WorkShop { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull #endregion #region 鏋氫妇鍙橀噺 @@ -246,63 +303,68 @@ Enum1, } */ - public enum STATUSs - { - [Description("鍒濆鍖�")] - Init, - [Description("宸插鍏�")] - Imported, - [Description("宸蹭笅鍙�")] - Release, - [Description("鐢熶骇涓�")] - Working, - [Description("宸叉殏鍋�")] - Paused, - [Description("宸插叧闂�")] - Closed, - } /// <summary> - /// 鏋氫妇锛氬伐鑹虹姸鎬�(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴) + /// 鏋氫妇锛氬伐鍗曠被鍨�(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏) /// </summary> - public enum ROUTE_STATUSs - { - [Description("寰呴厤缃�")] - WaitSet, - [Description("宸查厤缃�")] - Finish, - [Description("鍙栨秷")] - Cancel, - [Description("宸插叧闂�")] - Closed, - } + public enum ORDER_TYPEs + { + [Description("璁″垝")] + Plan = 0, + [Description("鏍囧噯")] + Standard = 1, + [Description("杩斿伐")] + Rework = 2, + [Description("鍦ㄥ簱鏀瑰埗")] + Restructuring = 3, + [Description("濮斿")] + Outsourcing = 5, + [Description("鐮斿彂")] + RD = 6, + [Description("棰勬祴")] + Forecast = 7, + [Description("鎷嗗嵏")] + Disassemble = 8, + } - /// <summary> - /// 宸ュ崟绫诲瀷鏋氫妇 - /// </summary> - public enum ORDER_TYPEs { - [Description("璁″垝")] - Plan=0, - [Description("鏍囧噯")] - Standard=1, - [Description("杩斿伐")] - Rework=2, - [Description("鍦ㄥ簱鏀瑰埗")] - Restructuring=3, - [Description("濮斿")] - Outsourcing = 5, - [Description("鐮斿彂")] - RD = 6, - [Description("棰勬祴")] - Forecast = 7, - [Description("鎷嗗嵏")] - Disassemble = 8, - } - #endregion + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�) + /// </summary> + public enum STATUSs + { + [Description("鍒濆鍖�")] + Init = 0, + [Description("宸插鍏�")] + Imported = 1, + [Description("宸蹭笅鍙�")] + Release = 2, + [Description("鐢熶骇涓�")] + Working = 3, + [Description("宸叉殏鍋�")] + Paused = 4, + [Description("宸插叧闂�")] + Closed = 5, + } - #region 鍏叡鏂规硶 + /// <summary> + /// 鏋氫妇锛氬伐鑹虹姸鎬�(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴) + /// </summary> + public enum ROUTE_STATUSs + { + [Description("寰呴厤缃�")] + WaitSet = 0, + [Description("宸查厤缃�")] + Finish = 1, + [Description("鍙栨秷")] + Cancel = 2, + [Description("鍏抽棴")] + Close = 3, + } + #endregion - #endregion + #region 鍏叡鏂规硶 - }//endClass + #endregion + + }//endClass } \ No newline at end of file -- Gitblit v1.9.3