From 08e80a111b3a1eedc1ec62623b5281f118749fa5 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 10 七月 2024 21:47:32 +0800 Subject: [PATCH] 工单增加批次号 --- Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs | 5 Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs | 371 +++++++++------ Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 436 +++++++++++------- Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs | 102 ++++ Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 427 +++++++++++------- 5 files changed, 851 insertions(+), 490 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 16ccf36..1049d26 100644 --- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs +++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_BATCH.cs @@ -29,6 +29,11 @@ [DisplayName("宸ュ崟鍙�")] public string ORDER_NO { get; set; } /// <summary> + /// 宸ュ崟鎵规鍙� + /// </summary> + [DisplayName("宸ュ崟鎵规鍙�")] + public string BATCH_NO { get; set; } + /// <summary> /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�) /// </summary> [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")] diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs new file mode 100644 index 0000000..31d5285 --- /dev/null +++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs @@ -0,0 +1,102 @@ +using System; +using SqlSugar; +using System.Linq; +using System.ComponentModel; +using System.Collections.Generic; + +namespace Tiger.Model +{ + /// <summary> + /// 瀹炰綋锛氬伐鍗曟潯鐮佹槑缁� + /// </summary> + [Description("Primary:ID")] + [DisplayName("宸ュ崟鏉$爜鏄庣粏")] + [Serializable] + [SugarTable("BIZ_MES_WO_SN")] + public class BIZ_MES_WO_SN : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛氬伐鍗曟潯鐮佹槑缁� + /// </summary> + public BIZ_MES_WO_SN() {} + #endregion + + #region 鍏叡灞炴�� + /// <summary> + /// 鍏宠仈宸ュ崟鍙� + /// </summary> + [DisplayName("鍏宠仈宸ュ崟鍙�")] + public string WORK_ORDER { get; set; } + /// <summary> + /// 鏉$爜 + /// </summary> + [DisplayName("鏉$爜")] + public string SN { get; set; } + /// <summary> + /// 鐘舵��(0NotInput鏈姇鍏1Inputed宸叉姇鍏�) + /// </summary> + [DisplayName("鐘舵��(0NotInput鏈姇鍏1Inputed宸叉姇鍏�)")] + public int STATUS { get; set; } + /// <summary> + /// 宸ュ崟鎵规鍙� + /// </summary> + [DisplayName("宸ュ崟鎵规鍙�")] + public string BATCH_NO { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] + public string REMARK { get; set; } + #endregion + + #region 铏氭嫙灞炴�� + /*渚嬪瓙 + [SugarColumn(IsIgnore = true)] + public string FieldName { get; set; } + */ + #endregion + + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO_SN绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_MES_WO_SNId))]//ClassA琛ㄤ腑鐨凚IZ_MES_WO_SNId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WO_SNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 + public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + */ + #endregion + + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 + public enum FieldNames + { + [Description("鏋氫妇鎻忚堪0")] + Enum0, + [Description("鏋氫妇鎻忚堪1")] + Enum1, + } + */ + + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0NotInput鏈姇鍏1Inputed宸叉姇鍏�) + /// </summary> + public enum STATUSs + { + [Description("鏈姇鍏�")] + NotInput = 0, + [Description("宸叉姇鍏�")] + Inputed = 1, + } + #endregion + + #region 鍏叡鏂规硶 + + #endregion + + }//endClass +} \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs index 1398806..fadf907 100644 --- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs +++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs @@ -6,149 +6,184 @@ namespace Tiger.Model { - /// <summary> - /// 瀹炰綋锛氱敓浜ц涓鸿褰� - /// </summary> - [Description("Primary:ID")] - [Serializable] - [SugarTable("MES_WIP_ACT")] - public class MES_WIP_ACT : DbEntityWithAuth - { - #region 鏋勯�犲嚱鏁� - /// <summary> - /// 瀹炰綋锛氱敓浜ц涓鸿褰� - /// </summary> - public MES_WIP_ACT() {} - #endregion + /// <summary> + /// 瀹炰綋锛氱敓浜ц涓鸿褰� + /// </summary> + [Description("Primary:ID")] + [DisplayName("鐢熶骇琛屼负璁板綍")] + [Serializable] + [SugarTable("MES_WIP_ACT")] + public class MES_WIP_ACT : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛氱敓浜ц涓鸿褰� + /// </summary> + public MES_WIP_ACT() { } + #endregion - #region 鍏叡灞炴�� - /// <summary> - /// 鐢熶骇杩囩▼璁板綍ID - /// </summary> - public string HIS_ID { get; set; } - /// <summary> - /// 杩囩珯鏉$爜 - /// </summary> - public string SN { get; set; } - /// <summary> - /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) - /// </summary> - public int STATUS { get; set; } - /// <summary> - /// 鐗╂枡缂栫爜 - /// </summary> - public string ITEM_CODE { get; set; } - /// <summary> - /// 宸ュ崟鍙� - /// </summary> - public string WORK_ORDER { get; set; } - /// <summary> - /// 鍔犲伐娈� - /// </summary> - public string SEGMENT { get; set; } - /// <summary> - /// 宸ヨ壓璺嚎ID - /// </summary> - public string ROT_ID { get; set; } - /// <summary> - /// 宸ヨ壓璺嚎鑺傜偣ID - /// </summary> - public string NODE_ID { get; set; } - /// <summary> - /// 宸ュ簭琛屼负ID - /// </summary> - public string ACT_ID { get; set; } - /// <summary> - /// 宸ュ巶缂栫爜 - /// </summary> - public string FTY_CODE { get; set; } - /// <summary> - /// 杞﹂棿缂栫爜 - /// </summary> - public string WS_CODE { get; set; } - /// <summary> - /// 浜х嚎缂栫爜 - /// </summary> - public string LINE_CODE { get; set; } - /// <summary> - /// 宀椾綅缂栫爜 - /// </summary> - public string POST_CODE { get; set; } - /// <summary> - /// 宸ュ簭缂栫爜 - /// </summary> - public string OPER_CODE { get; set; } - /// <summary> - /// 鎵樼洏/杞藉叿鏉$爜 - /// </summary> - public string TRAY_SN { get; set; } - /// <summary> - /// 褰撳墠鎿嶄綔鏃堕棿 - /// </summary> - public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 鐝埗缂栫爜 - /// </summary> - public string SFTS_CODE { get; set; } - /// <summary> - /// 鐝缂栫爜 - /// </summary> - public string SFT_CODE { get; set; } - /// <summary> - /// 鏃舵缂栫爜 - /// </summary> - public string PRD_CODE { get; set; } - /// <summary> - /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯) - /// </summary> - public int ACT_TYPE { get; set; } - /// <summary> - /// 琛屼负鎵爜 - /// </summary> - public string ACT_SN { get; set; } - /// <summary> - /// 琛屼负鎿嶄綔鍊�1 - /// </summary> - public string ACT_VALUE_1 { get; set; } - /// <summary> - /// 琛屼负鎿嶄綔鍊�2 - /// </summary> - public string ACT_VALUE_2 { get; set; } - /// <summary> - /// 琛屼负鎿嶄綔鍊�3 - /// </summary> - public string ACT_VALUE_3 { get; set; } - /// <summary> - /// 琛屼负鎿嶄綔鍊�4 - /// </summary> - public string ACT_VALUE_4 { get; set; } - /// <summary> - /// 琛屼负鎿嶄綔鍊�5 - /// </summary> - public string ACT_VALUE_5 { get; set; } - /// <summary> - /// 琛屼负鏄惁鎴愬姛(Y/N) - /// </summary> - public string ACT_RESULT { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - public string REMARK { get; set; } - /// <summary> - /// 杩芥函淇℃伅 - /// </summary> - public string TRACE_INFO { get; set; } - #endregion + #region 鍏叡灞炴�� + /// <summary> + /// 鐢熶骇杩囩▼璁板綍ID + /// </summary> + [DisplayName("鐢熶骇杩囩▼璁板綍ID")] + public string HIS_ID { get; set; } + /// <summary> + /// 杩囩珯鏉$爜 + /// </summary> + [DisplayName("杩囩珯鏉$爜")] + public string SN { get; set; } + /// <summary> + /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) + /// </summary> + [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")] + public int STATUS { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [DisplayName("鐗╂枡缂栫爜")] + public string ITEM_CODE { get; set; } + /// <summary> + /// 宸ュ崟鍙� + /// </summary> + [DisplayName("宸ュ崟鍙�")] + public string WORK_ORDER { get; set; } + /// <summary> + /// 宸ュ崟鎵规鍙� + /// </summary> + [DisplayName("宸ュ崟鎵规鍙�")] + public string BATCH_NO { get; set; } + /// <summary> + /// 鍔犲伐娈� + /// </summary> + [DisplayName("鍔犲伐娈�")] + public string SEGMENT { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎ID")] + public string ROT_ID { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎鑺傜偣ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")] + public string NODE_ID { get; set; } + /// <summary> + /// 宸ュ簭琛屼负ID + /// </summary> + [DisplayName("宸ュ簭琛屼负ID")] + public string ACT_ID { get; set; } + /// <summary> + /// 宸ュ巶缂栫爜 + /// </summary> + [DisplayName("宸ュ巶缂栫爜")] + public string FTY_CODE { get; set; } + /// <summary> + /// 杞﹂棿缂栫爜 + /// </summary> + [DisplayName("杞﹂棿缂栫爜")] + public string WS_CODE { get; set; } + /// <summary> + /// 浜х嚎缂栫爜 + /// </summary> + [DisplayName("浜х嚎缂栫爜")] + public string LINE_CODE { get; set; } + /// <summary> + /// 宀椾綅缂栫爜 + /// </summary> + [DisplayName("宀椾綅缂栫爜")] + public string POST_CODE { get; set; } + /// <summary> + /// 宸ュ簭缂栫爜 + /// </summary> + [DisplayName("宸ュ簭缂栫爜")] + public string OPER_CODE { get; set; } + /// <summary> + /// 鎵樼洏/杞藉叿鏉$爜 + /// </summary> + [DisplayName("鎵樼洏/杞藉叿鏉$爜")] + public string TRAY_SN { get; set; } + /// <summary> + /// 褰撳墠鎿嶄綔鏃堕棿 + /// </summary> + [DisplayName("褰撳墠鎿嶄綔鏃堕棿")] + public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 鐝埗缂栫爜 + /// </summary> + [DisplayName("鐝埗缂栫爜")] + public string SFTS_CODE { get; set; } + /// <summary> + /// 鐝缂栫爜 + /// </summary> + [DisplayName("鐝缂栫爜")] + public string SFT_CODE { get; set; } + /// <summary> + /// 鏃舵缂栫爜 + /// </summary> + [DisplayName("鏃舵缂栫爜")] + public string PRD_CODE { get; set; } + /// <summary> + /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯) + /// </summary> + [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)")] + public int ACT_TYPE { get; set; } + /// <summary> + /// 琛屼负鎵爜 + /// </summary> + [DisplayName("琛屼负鎵爜")] + public string ACT_SN { get; set; } + /// <summary> + /// 琛屼负鎿嶄綔鍊�1 + /// </summary> + [DisplayName("琛屼负鎿嶄綔鍊�1")] + public string ACT_VALUE_1 { get; set; } + /// <summary> + /// 琛屼负鎿嶄綔鍊�2 + /// </summary> + [DisplayName("琛屼负鎿嶄綔鍊�2")] + public string ACT_VALUE_2 { get; set; } + /// <summary> + /// 琛屼负鎿嶄綔鍊�3 + /// </summary> + [DisplayName("琛屼负鎿嶄綔鍊�3")] + public string ACT_VALUE_3 { get; set; } + /// <summary> + /// 琛屼负鎿嶄綔鍊�4 + /// </summary> + [DisplayName("琛屼负鎿嶄綔鍊�4")] + public string ACT_VALUE_4 { get; set; } + /// <summary> + /// 琛屼负鎿嶄綔鍊�5 + /// </summary> + [DisplayName("琛屼负鎿嶄綔鍊�5")] + public string ACT_VALUE_5 { get; set; } + /// <summary> + /// 琛屼负鏄惁鎴愬姛(Y/N) + /// </summary> + [DisplayName("琛屼负鏄惁鎴愬姛(Y/N)")] + public string ACT_RESULT { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] + public string REMARK { get; set; } + /// <summary> + /// 杩芥函淇℃伅 + /// </summary> + [DisplayName("杩芥函淇℃伅")] + public string TRACE_INFO { get; set; } + #endregion - #region 铏氭嫙灞炴�� - /*渚嬪瓙 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ - #endregion + #endregion - #region 澶栭敭灞炴�� - /*渚嬪瓙 + #region 澶栭敭灞炴�� + /*渚嬪瓙 //涓�瀵逛竴澶栭敭瀵艰埅 [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁 public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull @@ -159,10 +194,10 @@ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ - #endregion + #endregion - #region 鏋氫妇鍙橀噺 - /*渚嬪瓙 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { [Description("鏋氫妇鎻忚堪0")] @@ -171,11 +206,59 @@ Enum1, } */ - #endregion - #region 鍏叡鏂规硶 + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) + /// </summary> + public enum STATUSs + { + [Description("鍒濆鍖�")] + Init = 0, + [Description("宸叉姇鍏�")] + Input = 1, + [Description("鑹搧杩囩珯")] + OK = 2, + [Description("涓嶈壇杩囩珯")] + NG = 3, + [Description("缁翠慨涓�")] + Repair = 4, + [Description("宸插畬宸�")] + Finished = 5, + [Description("宸叉姤搴�")] + Scrap = 6, + [Description("宸插叆搴�")] + InStorage = 7, + [Description("宸叉嫆鏀�")] + Reject = 8, + [Description("宸插嚭璐�")] + Shipped = 9, + } - #endregion + /// <summary> + /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯) + /// </summary> + public enum ACT_TYPEs + { + [Description("榛樿琛屼负")] + Normal = 0, + [Description("鎵爜楠岃瘉")] + Scan = 1, + [Description("缁勮涓婃枡")] + Assy = 2, + [Description("浜у搧娴嬭瘯")] + Test = 3, + [Description("浜у搧鎶芥")] + Audit = 4, + [Description("鏍囩鎵撳嵃")] + Print = 5, + [Description("鍖呰瑙勫垯")] + Package = 6, + } + #endregion - }//endClass + #region 鍏叡鏂规硶 + + #endregion + + }//endClass } \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs index 9edf1af..74df14f 100644 --- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs +++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs @@ -6,192 +6,277 @@ namespace Tiger.Model { - /// <summary> - /// 实体:在制品信息表 - /// </summary> - [Description("Primary:ID")] - [Serializable] - [SugarTable("MES_WIP_DATA")] - public class MES_WIP_DATA : DbEntityWithAuth - { - #region 构造函数 - /// <summary> - /// 实体:在制品信息表 - /// </summary> - public MES_WIP_DATA() {} - #endregion + /// <summary> + /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛� + /// </summary> + [Description("Primary:ID")] + [DisplayName("鍦ㄥ埗鍝佷俊鎭〃")] + [Serializable] + [SugarTable("MES_WIP_DATA")] + public class MES_WIP_DATA : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛� + /// </summary> + public MES_WIP_DATA() { } + #endregion - #region 公共属性 - /// <summary> - /// 过站条码 - /// </summary> - public string SN { get; set; } - /// <summary> - /// 状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货) - /// </summary> - public int STATUS { get; set; } - /// <summary> - /// 物料编码 - /// </summary> - public string ITEM_CODE { get; set; } - /// <summary> - /// 工单号 - /// </summary> - public string WORK_ORDER { get; set; } - /// <summary> - /// 加工段 - /// </summary> - public string SEGMENT { get; set; } - /// <summary> - /// 工艺路线ID - /// </summary> - public string ROT_ID { get; set; } - /// <summary> - /// 工艺路线节点ID - /// </summary> - public string NODE_ID { get; set; } - /// <summary> - /// 工序编码 - /// </summary> - public string OPER_CODE { get; set; } - /// <summary> - /// 工厂编码 - /// </summary> - public string FTY_CODE { get; set; } - /// <summary> - /// 车间编码 - /// </summary> - public string WS_CODE { get; set; } - /// <summary> - /// 产线编码 - /// </summary> - public string LINE_CODE { get; set; } - /// <summary> - /// 岗位编码 - /// </summary> - public string POST_CODE { get; set; } - /// <summary> - /// 锁定标记 - /// </summary> - public string HOLD_FLAG { get; set; } - /// <summary> - /// 返工标记 - /// </summary> - public string REWORK_FLAG { get; set; } - /// <summary> - /// 是否完工 - /// </summary> - public string FINISHED_FLAG { get; set; } - /// <summary> - /// 托盘/载具条码 - /// </summary> - public string TRAY_SN { get; set; } - /// <summary> - /// 容器/内包装条码 - /// </summary> - public string CONTAINER_SN { get; set; } - /// <summary> - /// 外箱条码 - /// </summary> - public string CARTON_SN { get; set; } - /// <summary> - /// 栈板条码 - /// </summary> - public string PALLET_SN { get; set; } - /// <summary> - /// 是否入库 - /// </summary> - public string INV_FLAG { get; set; } - /// <summary> - /// 入库日期 - /// </summary> - public DateTime INV_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 投入时间 - /// </summary> - public DateTime INLINE_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 产出时间 - /// </summary> - public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 当前操作时间 - /// </summary> - public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 班制编码 - /// </summary> - public string SFTS_CODE { get; set; } - /// <summary> - /// 班次编码 - /// </summary> - public string SFT_CODE { get; set; } - /// <summary> - /// 时段编码 - /// </summary> - public string PRD_CODE { get; set; } - /// <summary> - /// 抽检状态(0Unsampled未抽检|1NoSampling不抽检|2WaitCheck待检验|3Checking检验中|4Completed检验完|5Locked已锁定) - /// </summary> - public int OBA_STATUS { get; set; } - /// <summary> - /// 抽检批次号 - /// </summary> - public string OBA_BATCH { get; set; } - /// <summary> - /// 锁定批次号 - /// </summary> - public string LOCK_BATCH { get; set; } - /// <summary> - /// 出货时间 - /// </summary> - public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 出货单号 - /// </summary> - public string SHIPPING_ORDER { get; set; } - /// <summary> - /// 备注 - /// </summary> - public string REMARK { get; set; } - #endregion + #region 鍏叡灞炴�� + /// <summary> + /// 杩囩珯鏉$爜 + /// </summary> + [DisplayName("杩囩珯鏉$爜")] + public string SN { get; set; } + /// <summary> + /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) + /// </summary> + [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")] + public int STATUS { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [DisplayName("鐗╂枡缂栫爜")] + public string ITEM_CODE { get; set; } + /// <summary> + /// 宸ュ崟鍙� + /// </summary> + [DisplayName("宸ュ崟鍙�")] + public string WORK_ORDER { get; set; } + /// <summary> + /// 宸ュ崟鎵规鍙� + /// </summary> + [DisplayName("宸ュ崟鎵规鍙�")] + public string BATCH_NO { get; set; } + /// <summary> + /// 鍔犲伐娈� + /// </summary> + [DisplayName("鍔犲伐娈�")] + public string SEGMENT { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎ID")] + public string ROT_ID { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎鑺傜偣ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")] + public string NODE_ID { get; set; } + /// <summary> + /// 宸ュ簭缂栫爜 + /// </summary> + [DisplayName("宸ュ簭缂栫爜")] + public string OPER_CODE { get; set; } + /// <summary> + /// 宸ュ巶缂栫爜 + /// </summary> + [DisplayName("宸ュ巶缂栫爜")] + public string FTY_CODE { get; set; } + /// <summary> + /// 杞﹂棿缂栫爜 + /// </summary> + [DisplayName("杞﹂棿缂栫爜")] + public string WS_CODE { get; set; } + /// <summary> + /// 浜х嚎缂栫爜 + /// </summary> + [DisplayName("浜х嚎缂栫爜")] + public string LINE_CODE { get; set; } + /// <summary> + /// 宀椾綅缂栫爜 + /// </summary> + [DisplayName("宀椾綅缂栫爜")] + public string POST_CODE { get; set; } + /// <summary> + /// 閿佸畾鏍囪 + /// </summary> + [DisplayName("閿佸畾鏍囪")] + public string HOLD_FLAG { get; set; } + /// <summary> + /// 杩斿伐鏍囪 + /// </summary> + [DisplayName("杩斿伐鏍囪")] + public string REWORK_FLAG { get; set; } + /// <summary> + /// 鏄惁瀹屽伐 + /// </summary> + [DisplayName("鏄惁瀹屽伐")] + public string FINISHED_FLAG { get; set; } + /// <summary> + /// 鎵樼洏/杞藉叿鏉$爜 + /// </summary> + [DisplayName("鎵樼洏/杞藉叿鏉$爜")] + public string TRAY_SN { get; set; } + /// <summary> + /// 瀹瑰櫒/鍐呭寘瑁呮潯鐮� + /// </summary> + [DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")] + public string CONTAINER_SN { get; set; } + /// <summary> + /// 澶栫鏉$爜 + /// </summary> + [DisplayName("澶栫鏉$爜")] + public string CARTON_SN { get; set; } + /// <summary> + /// 鏍堟澘鏉$爜 + /// </summary> + [DisplayName("鏍堟澘鏉$爜")] + public string PALLET_SN { get; set; } + /// <summary> + /// 鏄惁鍏ュ簱 + /// </summary> + [DisplayName("鏄惁鍏ュ簱")] + public string INV_FLAG { get; set; } + /// <summary> + /// 鍏ュ簱鏃ユ湡 + /// </summary> + [DisplayName("鍏ュ簱鏃ユ湡")] + public DateTime INV_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 鎶曞叆鏃堕棿 + /// </summary> + [DisplayName("鎶曞叆鏃堕棿")] + public DateTime INLINE_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 浜у嚭鏃堕棿 + /// </summary> + [DisplayName("浜у嚭鏃堕棿")] + public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 褰撳墠鎿嶄綔鏃堕棿 + /// </summary> + [DisplayName("褰撳墠鎿嶄綔鏃堕棿")] + public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 鐝埗缂栫爜 + /// </summary> + [DisplayName("鐝埗缂栫爜")] + public string SFTS_CODE { get; set; } + /// <summary> + /// 鐝缂栫爜 + /// </summary> + [DisplayName("鐝缂栫爜")] + public string SFT_CODE { get; set; } + /// <summary> + /// 鏃舵缂栫爜 + /// </summary> + [DisplayName("鏃舵缂栫爜")] + public string PRD_CODE { get; set; } + /// <summary> + /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�) + /// </summary> + [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")] + public int OBA_STATUS { get; set; } + /// <summary> + /// 鎶芥鎵规鍙� + /// </summary> + [DisplayName("鎶芥鎵规鍙�")] + public string OBA_BATCH { get; set; } + /// <summary> + /// 閿佸畾鎵规鍙� + /// </summary> + [DisplayName("閿佸畾鎵规鍙�")] + public string LOCK_BATCH { get; set; } + /// <summary> + /// 鍑鸿揣鏃堕棿 + /// </summary> + [DisplayName("鍑鸿揣鏃堕棿")] + public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 鍑鸿揣鍗曞彿 + /// </summary> + [DisplayName("鍑鸿揣鍗曞彿")] + public string SHIPPING_ORDER { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] + public string REMARK { get; set; } + #endregion - #region 虚拟属性 - /*例子 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ - #endregion + #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_DATA类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA表中的MES_WIP_DATAId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 + public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ - #endregion + #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - #endregion - #region 公共方法 + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) + /// </summary> + public enum STATUSs + { + [Description("鍒濆鍖�")] + Init = 0, + [Description("宸叉姇鍏�")] + Input = 1, + [Description("鑹搧杩囩珯")] + OK = 2, + [Description("涓嶈壇杩囩珯")] + NG = 3, + [Description("缁翠慨涓�")] + Repair = 4, + [Description("宸插畬宸�")] + Finished = 5, + [Description("宸叉姤搴�")] + Scrap = 6, + [Description("宸插叆搴�")] + InStorage = 7, + [Description("宸叉嫆鏀�")] + Reject = 8, + [Description("宸插嚭璐�")] + Shipped = 9, + } - #endregion + /// <summary> + /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�) + /// </summary> + public enum OBA_STATUSs + { + [Description("鏈娊妫�")] + Unsampled = 0, + [Description("涓嶆娊妫�")] + NoSampling = 1, + [Description("寰呮楠�")] + WaitCheck = 2, + [Description("妫�楠屼腑")] + Checking = 3, + [Description("妫�楠屽畬")] + Completed = 4, + [Description("宸查攣瀹�")] + Locked = 5, + } + #endregion - }//endClass + #region 鍏叡鏂规硶 + + #endregion + + }//endClass } \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs index 77032c6..f1a49f2 100644 --- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs +++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs @@ -6,196 +6,282 @@ namespace Tiger.Model { - /// <summary> - /// 实体:生产过程记录 - /// </summary> - [Description("Primary:ID")] - [Serializable] - [SugarTable("MES_WIP_HIS")] - public class MES_WIP_HIS : DbEntityWithAuth - { - #region 构造函数 - /// <summary> - /// 实体:生产过程记录 - /// </summary> - public MES_WIP_HIS() {} - #endregion + /// <summary> + /// 瀹炰綋锛氱敓浜ц繃绋嬭褰� + /// </summary> + [Description("Primary:ID")] + [DisplayName("鐢熶骇杩囩▼璁板綍")] + [Serializable] + [SugarTable("MES_WIP_HIS")] + public class MES_WIP_HIS : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛氱敓浜ц繃绋嬭褰� + /// </summary> + public MES_WIP_HIS() { } + #endregion - #region 公共属性 - /// <summary> - /// 过站条码 - /// </summary> - public string SN { get; set; } - /// <summary> - /// 状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货) - /// </summary> - public int STATUS { get; set; } - /// <summary> - /// 物料编码 - /// </summary> - public string ITEM_CODE { get; set; } - /// <summary> - /// 工单号 - /// </summary> - public string WORK_ORDER { get; set; } - /// <summary> - /// 加工段 - /// </summary> - public string SEGMENT { get; set; } - /// <summary> - /// 工艺路线ID - /// </summary> - public string ROT_ID { get; set; } - /// <summary> - /// 工艺路线节点ID - /// </summary> - public string NODE_ID { get; set; } - /// <summary> - /// 工厂编码 - /// </summary> - public string FTY_CODE { get; set; } - /// <summary> - /// 车间编码 - /// </summary> - public string WS_CODE { get; set; } - /// <summary> - /// 产线编码 - /// </summary> - public string LINE_CODE { get; set; } - /// <summary> - /// 岗位编码 - /// </summary> - public string POST_CODE { get; set; } - /// <summary> - /// 工序编码 - /// </summary> - public string OPER_CODE { get; set; } - /// <summary> - /// 锁定标记 - /// </summary> - public string HOLD_FLAG { get; set; } - /// <summary> - /// 返工标记 - /// </summary> - public string REWORK_FLAG { get; set; } - /// <summary> - /// 是否完工 - /// </summary> - public string FINISHED_FLAG { get; set; } - /// <summary> - /// 托盘/载具条码 - /// </summary> - public string TRAY_SN { get; set; } - /// <summary> - /// 容器/内包装条码 - /// </summary> - public string CONTAINER_SN { get; set; } - /// <summary> - /// 外箱条码 - /// </summary> - public string CARTON_SN { get; set; } - /// <summary> - /// 栈板条码 - /// </summary> - public string PALLET_SN { get; set; } - /// <summary> - /// 是否入库 - /// </summary> - public string INV_FLAG { get; set; } - /// <summary> - /// 入库日期 - /// </summary> - public DateTime INV_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 投入时间 - /// </summary> - public DateTime INLINE_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 产出时间 - /// </summary> - public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 当前操作时间 - /// </summary> - public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 班制编码 - /// </summary> - public string SFTS_CODE { get; set; } - /// <summary> - /// 班次编码 - /// </summary> - public string SFT_CODE { get; set; } - /// <summary> - /// 时段编码 - /// </summary> - public string PRD_CODE { get; set; } - /// <summary> - /// 抽检状态(0Unsampled未抽检|1NoSampling不抽检|2WaitCheck待检验|3Checking检验中|4Completed检验完|5Locked已锁定) - /// </summary> - public int OBA_STATUS { get; set; } - /// <summary> - /// 抽检批次号 - /// </summary> - public string OBA_BATCH { get; set; } - /// <summary> - /// 锁定批次号 - /// </summary> - public string LOCK_BATCH { get; set; } - /// <summary> - /// 出货时间 - /// </summary> - public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 出货单号 - /// </summary> - public string SHIPPING_ORDER { get; set; } - /// <summary> - /// 备注 - /// </summary> - public string REMARK { get; set; } - /// <summary> - /// 追溯信息 - /// </summary> - public string TRACE_INFO { get; set; } - #endregion + #region 鍏叡灞炴�� + /// <summary> + /// 杩囩珯鏉$爜 + /// </summary> + [DisplayName("杩囩珯鏉$爜")] + public string SN { get; set; } + /// <summary> + /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) + /// </summary> + [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")] + public int STATUS { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [DisplayName("鐗╂枡缂栫爜")] + public string ITEM_CODE { get; set; } + /// <summary> + /// 宸ュ崟鍙� + /// </summary> + [DisplayName("宸ュ崟鍙�")] + public string WORK_ORDER { get; set; } + /// <summary> + /// 宸ュ崟鎵规鍙� + /// </summary> + [DisplayName("宸ュ崟鎵规鍙�")] + public string BATCH_NO { get; set; } + /// <summary> + /// 鍔犲伐娈� + /// </summary> + [DisplayName("鍔犲伐娈�")] + public string SEGMENT { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎ID")] + public string ROT_ID { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎鑺傜偣ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")] + public string NODE_ID { get; set; } + /// <summary> + /// 宸ュ巶缂栫爜 + /// </summary> + [DisplayName("宸ュ巶缂栫爜")] + public string FTY_CODE { get; set; } + /// <summary> + /// 杞﹂棿缂栫爜 + /// </summary> + [DisplayName("杞﹂棿缂栫爜")] + public string WS_CODE { get; set; } + /// <summary> + /// 浜х嚎缂栫爜 + /// </summary> + [DisplayName("浜х嚎缂栫爜")] + public string LINE_CODE { get; set; } + /// <summary> + /// 宀椾綅缂栫爜 + /// </summary> + [DisplayName("宀椾綅缂栫爜")] + public string POST_CODE { get; set; } + /// <summary> + /// 宸ュ簭缂栫爜 + /// </summary> + [DisplayName("宸ュ簭缂栫爜")] + public string OPER_CODE { get; set; } + /// <summary> + /// 閿佸畾鏍囪 + /// </summary> + [DisplayName("閿佸畾鏍囪")] + public string HOLD_FLAG { get; set; } + /// <summary> + /// 杩斿伐鏍囪 + /// </summary> + [DisplayName("杩斿伐鏍囪")] + public string REWORK_FLAG { get; set; } + /// <summary> + /// 鏄惁瀹屽伐 + /// </summary> + [DisplayName("鏄惁瀹屽伐")] + public string FINISHED_FLAG { get; set; } + /// <summary> + /// 鎵樼洏/杞藉叿鏉$爜 + /// </summary> + [DisplayName("鎵樼洏/杞藉叿鏉$爜")] + public string TRAY_SN { get; set; } + /// <summary> + /// 瀹瑰櫒/鍐呭寘瑁呮潯鐮� + /// </summary> + [DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")] + public string CONTAINER_SN { get; set; } + /// <summary> + /// 澶栫鏉$爜 + /// </summary> + [DisplayName("澶栫鏉$爜")] + public string CARTON_SN { get; set; } + /// <summary> + /// 鏍堟澘鏉$爜 + /// </summary> + [DisplayName("鏍堟澘鏉$爜")] + public string PALLET_SN { get; set; } + /// <summary> + /// 鏄惁鍏ュ簱 + /// </summary> + [DisplayName("鏄惁鍏ュ簱")] + public string INV_FLAG { get; set; } + /// <summary> + /// 鍏ュ簱鏃ユ湡 + /// </summary> + [DisplayName("鍏ュ簱鏃ユ湡")] + public DateTime INV_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 鎶曞叆鏃堕棿 + /// </summary> + [DisplayName("鎶曞叆鏃堕棿")] + public DateTime INLINE_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 浜у嚭鏃堕棿 + /// </summary> + [DisplayName("浜у嚭鏃堕棿")] + public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 褰撳墠鎿嶄綔鏃堕棿 + /// </summary> + [DisplayName("褰撳墠鎿嶄綔鏃堕棿")] + public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 鐝埗缂栫爜 + /// </summary> + [DisplayName("鐝埗缂栫爜")] + public string SFTS_CODE { get; set; } + /// <summary> + /// 鐝缂栫爜 + /// </summary> + [DisplayName("鐝缂栫爜")] + public string SFT_CODE { get; set; } + /// <summary> + /// 鏃舵缂栫爜 + /// </summary> + [DisplayName("鏃舵缂栫爜")] + public string PRD_CODE { get; set; } + /// <summary> + /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�) + /// </summary> + [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")] + public int OBA_STATUS { get; set; } + /// <summary> + /// 鎶芥鎵规鍙� + /// </summary> + [DisplayName("鎶芥鎵规鍙�")] + public string OBA_BATCH { get; set; } + /// <summary> + /// 閿佸畾鎵规鍙� + /// </summary> + [DisplayName("閿佸畾鎵规鍙�")] + public string LOCK_BATCH { get; set; } + /// <summary> + /// 鍑鸿揣鏃堕棿 + /// </summary> + [DisplayName("鍑鸿揣鏃堕棿")] + public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 鍑鸿揣鍗曞彿 + /// </summary> + [DisplayName("鍑鸿揣鍗曞彿")] + public string SHIPPING_ORDER { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] + public string REMARK { get; set; } + /// <summary> + /// 杩芥函淇℃伅 + /// </summary> + [DisplayName("杩芥函淇℃伅")] + public string TRACE_INFO { get; set; } + #endregion - #region 虚拟属性 - /*例子 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ - #endregion + #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_HIS类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_HISId))]//ClassA表中的MES_WIP_HISId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_HISId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_HIS绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_HISId))]//ClassA琛ㄤ腑鐨凪ES_WIP_HISId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_HISId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 + public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ - #endregion + #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - #endregion - #region 公共方法 + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�) + /// </summary> + public enum STATUSs + { + [Description("鍒濆鍖�")] + Init = 0, + [Description("宸叉姇鍏�")] + Input = 1, + [Description("鑹搧杩囩珯")] + OK = 2, + [Description("涓嶈壇杩囩珯")] + NG = 3, + [Description("缁翠慨涓�")] + Repair = 4, + [Description("宸插畬宸�")] + Finished = 5, + [Description("宸叉姤搴�")] + Scrap = 6, + [Description("宸插叆搴�")] + InStorage = 7, + [Description("宸叉嫆鏀�")] + Reject = 8, + [Description("宸插嚭璐�")] + Shipped = 9, + } - #endregion + /// <summary> + /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�) + /// </summary> + public enum OBA_STATUSs + { + [Description("鏈娊妫�")] + Unsampled = 0, + [Description("涓嶆娊妫�")] + NoSampling = 1, + [Description("寰呮楠�")] + WaitCheck = 2, + [Description("妫�楠屼腑")] + Checking = 3, + [Description("妫�楠屽畬")] + Completed = 4, + [Description("宸查攣瀹�")] + Locked = 5, + } + #endregion - }//endClass + #region 鍏叡鏂规硶 + + #endregion + + }//endClass } \ No newline at end of file -- Gitblit v1.9.3