From 976d3ae1547b896cc5c7875408c09616d5c2ee55 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期二, 26 十一月 2024 20:51:17 +0800 Subject: [PATCH] 箱数更新 --- Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 552 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 377 insertions(+), 175 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs index 77032c6..7bf3d19 100644 --- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs +++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs @@ -6,196 +6,398 @@ 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() { } - #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 + /// <summary> + /// 瀹炰綋锛氱敓浜ц繃绋嬭褰� + /// </summary> + /// <param name="data">鍘嗗彶鐨勬潵婧怚tem</param> + /// <param name="traceInfo">杩芥函淇℃伅</param> + public MES_WIP_HIS(MES_WIP_DATA data, string traceInfo) + { + ID = Guid.NewGuid().ToString("N"); + CREATE_USER = data.CREATE_USER; + UPDATE_USER = data.UPDATE_USER; + AUTH_ORG = data.AUTH_ORG; + AUTH_PROD = data.AUTH_PROD; + AUTH_WH = data.AUTH_WH; + WIP_ID = data.ID; + SN = data.SN; + STATUS = data.STATUS; + ITEM_CODE = data.ITEM_CODE; + QTY = data.QTY; + WORK_ORDER = data.WORK_ORDER; + BATCH_NO = data.BATCH_NO; + ROT_CODE = data.ROT_CODE; + NODE_ID = data.NODE_ID; + NODE_NAME = data.NODE_NAME; + FTY_CODE = data.FTY_CODE; + WS_CODE = data.WS_CODE; + LINE_CODE = data.LINE_CODE; + POST_CODE = data.POST_CODE; + OPER_CODE = data.OPER_CODE; + SEGMENT = data.SEGMENT; + HOLD_FLAG = data.HOLD_FLAG; + REWORK_FLAG = data.REWORK_FLAG; + UNBIND_FLAG = data.UNBIND_FLAG; + FINISHED_FLAG = data.FINISHED_FLAG; + DFT_FLAG = data.DFT_FLAG; + DFT_COUNT = data.DFT_COUNT; + DFT_CODE = data.DFT_CODE; + REFLOW_NODE = data.REFLOW_NODE; + FLOW_SN = data.FLOW_SN; + TRAY_SN = data.TRAY_SN; + INNER_SN = data.INNER_SN; + CARTON_SN = data.CARTON_SN; + PALLET_SN = data.PALLET_SN; + INV_FLAG = data.INV_FLAG; + INV_DATE = data.INV_DATE; + INLINE_DATE = data.INLINE_DATE; + OUTLINE_DATE = data.OUTLINE_DATE; + OPERATION_TIME = data.OPERATION_TIME; + SFTS_CODE = data.SFTS_CODE; + SFT_CODE = data.SFT_CODE; + PRD_CODE = data.PRD_CODE; + OBA_STATUS = data.OBA_STATUS; + OBA_BATCH = data.OBA_BATCH; + LOCK_BATCH = data.LOCK_BATCH; + SHIPPING_DATE = data.SHIPPING_DATE; + SHIPPING_ORDER = data.SHIPPING_ORDER; + REMARK = data.REMARK; + TRACE_INFO = traceInfo; + } + #endregion - #region 虚拟属性 - /*例子 + #region 鍏叡灞炴�� + /// <summary> + /// 鍦ㄥ埗鍝両D + /// </summary> + [DisplayName("鍦ㄥ埗鍝両D")] + public string WIP_ID { get; set; } + /// <summary> + /// 杩囩珯鏉$爜 + /// </summary> + [DisplayName("杩囩珯鏉$爜")] + public string SN { get; set; } + /// <summary> + /// 鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎) + /// </summary> + [DisplayName("鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)")] + public int STATUS { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [DisplayName("鐗╂枡缂栫爜")] + public string ITEM_CODE { get; set; } + /// <summary> + /// 鏁伴噺 + /// </summary> + [DisplayName("鏁伴噺")] + public double QTY { get; set; } = 1; + /// <summary> + /// 宸ュ崟鍙� + /// </summary> + [DisplayName("宸ュ崟鍙�")] + public string WORK_ORDER { get; set; } + /// <summary> + /// 宸ュ崟鎵规鍙� + /// </summary> + [DisplayName("宸ュ崟鎵规鍙�")] + public string BATCH_NO { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎缂栫爜 + /// </summary> + [DisplayName("宸ヨ壓璺嚎缂栫爜")] + public string ROT_CODE { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎鑺傜偣ID + /// </summary> + [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")] + public string NODE_ID { get; set; } + /// <summary> + /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О + /// </summary> + [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")] + public string NODE_NAME { 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 SEGMENT { get; set; } + /// <summary> + /// 閿佸畾鏍囪 + /// </summary> + [DisplayName("閿佸畾鏍囪")] + public string HOLD_FLAG { get; set; } + /// <summary> + /// 杩斿伐鏍囪 + /// </summary> + [DisplayName("杩斿伐鏍囪")] + public string REWORK_FLAG { get; set; } + /// <summary> + /// 瑙g粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻) + /// </summary> + [DisplayName("瑙g粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)")] + public string UNBIND_FLAG { get; set; } + /// <summary> + /// 鏄惁瀹屽伐 + /// </summary> + [DisplayName("鏄惁瀹屽伐")] + public string FINISHED_FLAG { get; set; } + /// <summary> + /// 鏄惁涓嶈壇 + /// </summary> + [DisplayName("鏄惁涓嶈壇")] + public string DFT_FLAG { get; set; } + /// <summary> + /// 涓嶈壇璁℃暟 + /// </summary> + [DisplayName("涓嶈壇璁℃暟")] + public int DFT_COUNT { get; set; } + /// <summary> + /// 涓嶈壇浠g爜缂栫爜 + /// </summary> + [DisplayName("涓嶈壇浠g爜缂栫爜")] + public string DFT_CODE { get; set; } + /// <summary> + /// 缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭) + /// </summary> + [DisplayName("缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)")] + public string REFLOW_NODE { get; set; } + /// <summary> + /// 鍘傚唴娴佽浆鏉$爜 + /// </summary> + [DisplayName("鍘傚唴娴佽浆鏉$爜")] + public string FLOW_SN { get; set; } + /// <summary> + /// 鎵樼洏/杞藉叿鏉$爜 + /// </summary> + [DisplayName("鎵樼洏/杞藉叿鏉$爜")] + public string TRAY_SN { get; set; } + /// <summary> + /// 鍐呭寘瑁呮潯鐮� + /// </summary> + [DisplayName("鍐呭寘瑁呮潯鐮�")] + public string INNER_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> + /// 鎿嶄綔鑰楁椂(s) + /// </summary> + [DisplayName("鎿嶄綔鑰楁椂(ms)")] + public long ELAPSED_TIME { get; set; } = 0; + /// <summary> + /// 杩芥函淇℃伅 + /// </summary> + [DisplayName("杩芥函淇℃伅")] + public string TRACE_INFO { get; set; } + #endregion + + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ - #endregion + /// <summary> + /// 鏄惁宸茬粡鑹搧杩囩珯 + /// </summary> + [SugarColumn(IsIgnore = true)] + public bool IsFinished => DFT_FLAG != "Y"; + #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鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎) + /// </summary> + public enum STATUSs + { + [Description("鍒濆鍖�")] + Init = 0, + [Description("宸叉姇鍏�")] + Input = 1, + [Description("鑹搧杩囩珯")] + OK = 2, + [Description("涓嶈壇杩囩珯")] + NG = 3, + [Description("缁翠慨涓�")] + Repair = 4, + [Description("宸插畬宸�")] + Finished = 5, + [Description("宸插叆搴�")] + InStorage = 6, + [Description("宸叉嫆鏀�")] + Reject = 7, + [Description("宸插嚭璐�")] + Shipped = 8, + [Description("寮傚父涓嬬嚎")] + Offline = 9, + [Description("宸叉姤搴�")] + Scrap = 10, + } - #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