From 0fdb04b7c451d7c59b226c25425722afd3364916 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 25 九月 2024 16:37:52 +0800
Subject: [PATCH] 优化工序和行为逻辑
---
Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs | 520 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 275 insertions(+), 245 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
index de28a3c..69ea248 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
@@ -6,269 +6,299 @@
namespace Tiger.Model
{
- /// <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
+ /// <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
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
+ /// <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 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>
+ /// 宸ュ簭琛屼负ID
+ /// </summary>
+ [DisplayName("宸ュ簭琛屼负ID")]
+ public string ACT_ID { get; set; }
+ /// <summary>
+ /// 琛屼负鍚嶇О
+ /// </summary>
+ [DisplayName("琛屼负鍚嶇О")]
+ public string ACT_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 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 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>
+ /// 鎿嶄綔鑰楁椂(s)
/// </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 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>
- /// 工序行为ID
- /// </summary>
- [DisplayName("工序行为ID")]
- public string ACT_ID { get; set; }
- /// <summary>
- /// 行为名称
- /// </summary>
- [DisplayName("行为名称")]
- public string ACT_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 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
+ [DisplayName("鎿嶄綔鑰楁椂(ms)")]
+ public long ELAPSED_TIME { get; set; } = 0;
+ /// <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_ACT类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ACTId))]//ClassA表中的MES_WIP_ACTId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ACTId))]//ClassA琛ㄤ腑鐨凪ES_WIP_ACTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [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")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
- /// <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,
- }
+ /// <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,
+ }
- /// <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
+ /// <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
- #region 公共方法
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3