From 4361513fb831fdd416356e576682358bd72a121c Mon Sep 17 00:00:00 2001 From: Cloud Zhang <941187371@qq.com> Date: 星期四, 16 五月 2024 14:20:36 +0800 Subject: [PATCH] 合并 --- Tiger.Model.Net/Entitys/MES/SMT_LOAD_HIS.cs | 211 ++++++++++++++++++++++++---------------------------- 1 files changed, 98 insertions(+), 113 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/SMT_LOAD_HIS.cs b/Tiger.Model.Net/Entitys/MES/SMT_LOAD_HIS.cs index 214dbc2..f7398ad 100644 --- a/Tiger.Model.Net/Entitys/MES/SMT_LOAD_HIS.cs +++ b/Tiger.Model.Net/Entitys/MES/SMT_LOAD_HIS.cs @@ -6,137 +6,122 @@ namespace Tiger.Model { - /// <summary> - /// 实体:SMT上料历史记录 - /// </summary> - [Description("Primary:ID")] - [Serializable] - [SugarTable("SMT_LOAD_HIS")] - public class SMT_LOAD_HIS : DbEntityWithAuth - { - #region 构造函数 - /// <summary> - /// 实体:SMT上料历史记录 - /// </summary> - public SMT_LOAD_HIS() {} - #endregion - - #region 公共属性 - /// <summary> - /// 操作类型(0Loading上料|1ChangeMaterial换料|2Unloading卸料|3ChangeFeeder换飞达|4UseStencil使用钢网|5UseSqueegee使用刮刀|6UseSolder使用锡膏|7UseAdhesive使用胶水) - /// </summary> - public string OPERATION { get; set; } - /// <summary> - /// 工单号 - /// </summary> - public string WORK_ORDER { get; set; } - /// <summary> - /// 产品编码 - /// </summary> - public string PROD_CODE { get; set; } - /// <summary> - /// 产线编码 - /// </summary> - public string LINE_CODE { get; set; } - /// <summary> - /// 贴片机编码 - /// </summary> - public string SMT_CODE { get; set; } - /// <summary> - /// 站位号 - /// </summary> - public string SLOT_NO { get; set; } - /// <summary> - /// 飞达类型 - /// </summary> - public string FEEDER_TYPE { get; set; } - /// <summary> - /// 飞达编码 - /// </summary> - public string FEEDER_CODE { get; set; } - /// <summary> - /// 物料编码 - /// </summary> - public string ITEM_CODE { get; set; } - /// <summary> - /// 加工面 - /// </summary> - public string PCB_SURFACE { get; set; } - /// <summary> - /// 钢网编码 - /// </summary> - public string STENCIL { get; set; } - /// <summary> - /// 刮刀编码 - /// </summary> - public string SQUEEGEE { get; set; } - /// <summary> - /// 锡膏UPN编码 - /// </summary> - public string SOLDER_UPN { get; set; } - /// <summary> - /// 胶水UPN编码 - /// </summary> - public string ADHESIVE_UPN { get; set; } - /// <summary> - /// 备注 - /// </summary> - public string REMARK { get; set; } + /// <summary> + /// 瀹炰綋锛歋MT涓婃枡鍘嗗彶璁板綍 + /// </summary> + [Description("Primary:ID")] + [Serializable] + [SugarTable("SMT_LOAD_HIS")] + public class SMT_LOAD_HIS : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛歋MT涓婃枡鍘嗗彶璁板綍 + /// </summary> + public SMT_LOAD_HIS() { } #endregion - #region 虚拟属性 - /*例子 + #region 鍏叡灞炴�� + /// <summary> + /// 鎿嶄綔绫诲瀷(0Loading涓婃枡|1ChangeMaterial鎹㈡枡|2Unloading鍗告枡|3ChangeFeeder鎹㈤杈緗4UseStencil浣跨敤閽㈢綉|5UseSqueegee浣跨敤鍒垁|6UseSolder浣跨敤閿¤啅|7UseAdhesive浣跨敤鑳舵按) + /// </summary> + public int OPERATION { get; set; } + /// <summary> + /// 宸ュ崟鍙� + /// </summary> + public string WORK_ORDER { get; set; } + /// <summary> + /// 浜у搧缂栫爜 + /// </summary> + public string PROD_CODE { get; set; } + /// <summary> + /// 浜х嚎缂栫爜 + /// </summary> + public string LINE_CODE { get; set; } + /// <summary> + /// 璐寸墖鏈虹紪鐮� + /// </summary> + public string SMT_CODE { get; set; } + /// <summary> + /// 绔欎綅鍙� + /// </summary> + public string SLOT_NO { get; set; } + /// <summary> + /// 椋炶揪绫诲瀷 + /// </summary> + public string FEEDER_TYPE { get; set; } + /// <summary> + /// 椋炶揪缂栫爜 + /// </summary> + public string FEEDER_CODE { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + public string ITEM_CODE { get; set; } + /// <summary> + /// 鍔犲伐闈�(鎻掍欢闈�:A/C|1鐒婇敗闈�:B/S) + /// </summary> + public string PCB_SURFACE { get; set; } + /// <summary> + /// 涓婃枡鏉$爜 + /// </summary> + public string SN { get; set; } + /// <summary> + /// 閽㈢綉缂栫爜 + /// </summary> + public string STENCIL { get; set; } + /// <summary> + /// 鍒垁缂栫爜 + /// </summary> + public string SQUEEGEE { get; set; } + /// <summary> + /// 閿¤啅UPN缂栫爜 + /// </summary> + public string SOLDER_UPN { get; set; } + /// <summary> + /// 鑳舵按UPN缂栫爜 + /// </summary> + public string ADHESIVE_UPN { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + public string REMARK { get; set; } + #endregion + + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是SMT_LOAD_HIS类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.SMT_LOAD_HISId))]//ClassA表中的SMT_LOAD_HISId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.SMT_LOAD_HISId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疭MT_LOAD_HIS绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.SMT_LOAD_HISId))]//ClassA琛ㄤ腑鐨凷MT_LOAD_HISId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.SMT_LOAD_HISId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 + public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - public enum OPERATIONs - { - [Description("上料")] - Loading, - [Description("换料")] - ChangeMaterial, - [Description("卸料")] - Unloading, - [Description("换飞达")] - ChangeFeeder, - [Description("使用钢网")] - UseStencil, - [Description("使用刮刀")] - UseSqueegee, - [Description("使用锡膏")] - UseSolder, - [Description("使用胶水")] - UseAdhesive, - } #endregion - #region 公共方法 + #region 鍏叡鏂规硶 #endregion -- Gitblit v1.9.3