From 570c0450147ecaabc90035fd3ff4b123171bfc04 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 08 五月 2024 17:22:41 +0800
Subject: [PATCH] 增加MES实体
---
Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs | 129 ++++++
/dev/null | 117 -----
Tiger.Model.Net/Entitys/MES/MES_SHIFT_PRD.cs | 30 +
Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs | 181 ++++++++
Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 201 +++++++++
Tiger.Model.Net/Tiger.Model.Net.csproj | 13
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 197 +++++++++
Tiger.Model.Net/Entitys/MES/MES_LINE.cs | 70 +-
Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 213 ++++++++++
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_POST.cs | 74 +++
10 files changed, 1,064 insertions(+), 161 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
index e69de29..0681cee 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
@@ -0,0 +1,213 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：工单
+ /// </summary>
+ [Description("Primary:ID")]
+ [Serializable]
+ [SugarTable("BIZ_MES_WO")]
+ public class BIZ_MES_WO : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：工单
+ /// </summary>
+ public BIZ_MES_WO() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 工单号
+ /// </summary>
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 工单类型(0Normal正常|1Rework返工)
+ /// </summary>
+ public string ORDER_TYPE { get; set; }
+ /// <summary>
+ /// 工单描述
+ /// </summary>
+ public string ORDER_DESC { get; set; }
+ /// <summary>
+ /// 父工单
+ /// </summary>
+ public string PARENT_ORDER { get; set; }
+ /// <summary>
+ /// 状态(0Init初始化|1Imported已导入|2Release已下发|3Working生产中|4Paused已暂停|5Closed已关闭)
+ /// </summary>
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 物料编码
+ /// </summary>
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 物料类型
+ /// </summary>
+ public string ITEM_TYPE { get; set; }
+ /// <summary>
+ /// 机型
+ /// </summary>
+ public string ITEM_MODEL { get; set; }
+ /// <summary>
+ /// 优先级
+ /// </summary>
+ public string PRIORITY { get; set; }
+ /// <summary>
+ /// 客户编码
+ /// </summary>
+ public string CUST_CODE { get; set; }
+ /// <summary>
+ /// 路由编码
+ /// </summary>
+ public string ROUTE_CODE { get; set; }
+ /// <summary>
+ /// 工艺状态(0WaitSet待配置|1Finish已配置|2Cancel取消|3Close关闭)
+ /// </summary>
+ public int ROUTE_STATUS { get; set; }
+ /// <summary>
+ /// 工厂
+ /// </summary>
+ public string FACTORY { get; set; }
+ /// <summary>
+ /// 计划线体
+ /// </summary>
+ public string PLAN_LINE { get; set; }
+ /// <summary>
+ /// 实际线体
+ /// </summary>
+ public string ACT_LINE { get; set; }
+ /// <summary>
+ /// 计划开始时间
+ /// </summary>
+ public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 计划结束时间
+ /// </summary>
+ public DateTime PLAN_END_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 实际开始时间
+ /// </summary>
+ public DateTime ACT_START_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 实际结束时间
+ /// </summary>
+ public DateTime ACT_END_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 标准作业人数
+ /// </summary>
+ public int STD_WORKERS_QTY { get; set; }
+ /// <summary>
+ /// 实际作业人数
+ /// </summary>
+ public int ACT_WORKER_QTY { get; set; }
+ /// <summary>
+ /// 导入时间
+ /// </summary>
+ public DateTime IMPORT_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 下发时间
+ /// </summary>
+ public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 下发人
+ /// </summary>
+ public string RELEASE_USER { get; set; }
+ /// <summary>
+ /// 变更时间
+ /// </summary>
+ public DateTime CHANGE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 变更人
+ /// </summary>
+ public string CHANGE_USER { get; set; }
+ /// <summary>
+ /// 计划数量
+ /// </summary>
+ public int PLAN_QTY { get; set; }
+ /// <summary>
+ /// 投入数量
+ /// </summary>
+ public int INPUT_QTY { get; set; }
+ /// <summary>
+ /// 完工数量
+ /// </summary>
+ public int OUTPUT_QTY { get; set; }
+ /// <summary>
+ /// 报废数量
+ /// </summary>
+ public int SCRAP_QTY { get; set; }
+ /// <summary>
+ /// 入库数量
+ /// </summary>
+ public int STOCK_IN_QTY { get; set; }
+ /// <summary>
+ /// UPH
+ /// </summary>
+ public double UPH { get; set; }
+ /// <summary>
+ /// UPPH
+ /// </summary>
+ public double UPPH { get; set; }
+ /// <summary>
+ /// 最后的工单历史ID
+ /// </summary>
+ public string LAST_HIST_ID { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 接口表记录ID
+ /// </summary>
+ public string FBILLNO_ID { get; set; }
+ /// <summary>
+ /// 备料单返回信息
+ /// </summary>
+ public string PREP_MSG { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_MES_WO类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_MES_WOId))]//ClassA表中的BIZ_MES_WOId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WOId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_LINE.cs b/Tiger.Model.Net/Entitys/MES/MES_LINE.cs
index cba7aa5..52b235d 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_LINE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_LINE.cs
@@ -7,89 +7,93 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：产线
+ /// 瀹炰綋锛氫骇绾�
/// </summary>
[Description("Primary:ID")]
[Serializable]
[SugarTable("MES_LINE")]
public class MES_LINE : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：产线
+ /// 瀹炰綋锛氫骇绾�
/// </summary>
public MES_LINE() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 产线编码
+ /// 浜х嚎缂栫爜
/// </summary>
public string LINE_CODE { get; set; }
/// <summary>
- /// 产线名称
+ /// 浜х嚎鍚嶇О
/// </summary>
public string LINE_NAME { get; set; }
/// <summary>
- /// 产线简称
+ /// 浜х嚎绠�绉�
/// </summary>
public string SHORT_NAME { get; set; }
/// <summary>
- /// 产线类型
+ /// 浜х嚎绫诲瀷
/// </summary>
public string LINE_TYPE { get; set; }
/// <summary>
- /// 车间编码
+ /// 杞﹂棿缂栫爜
/// </summary>
public string WS_CODE { get; set; }
/// <summary>
- /// 组织编码
+ /// 缁勭粐缂栫爜
/// </summary>
public string ORG_CODE { get; set; }
+ /// <summary>
+ /// 鐝埗缂栫爜
+ /// </summary>
+ public string SFTS_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鍚敤(Y/N)
+ /// </summary>
+ public string IS_ACTIVE { get; set; }
/// <summary>
- /// 是否启用(Y/N)
- /// </summary>
- public string IS_ACTIVE { get; set; }
- /// <summary>
- /// 备注
+ /// 澶囨敞
/// </summary>
public string REMARK { get; set; }
#endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
#endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_LINE类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_LINEId))]//ClassA表中的MES_LINEId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_LINEId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_LINE绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_LINEId))]//ClassA琛ㄤ腑鐨凪ES_LINEId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_LINEId), 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,
}
*/
#endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
#endregion
diff --git a/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
new file mode 100644
index 0000000..c447a0e
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
@@ -0,0 +1,129 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：产品工序行为
+ /// </summary>
+ [Description("Primary:ID")]
+ [Serializable]
+ [SugarTable("MES_PROD_NODE_ACT")]
+ public class MES_PROD_NODE_ACT : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：产品工序行为
+ /// </summary>
+ public MES_PROD_NODE_ACT() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 产品编码
+ /// </summary>
+ public string PROD_CODE { get; set; }
+ /// <summary>
+ /// 工序行为ID
+ /// </summary>
+ public string ACT_ID { get; set; }
+ /// <summary>
+ /// 工艺路线ID
+ /// </summary>
+ public string ROT_ID { get; set; }
+ /// <summary>
+ /// 工序节点ID
+ /// </summary>
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
+ /// </summary>
+ public int ACT_TYPE { get; set; }
+ /// <summary>
+ /// 扫码验证：条码规则
+ /// </summary>
+ public string RULE_CODE { get; set; }
+ /// <summary>
+ /// 组装上料：物料料号
+ /// </summary>
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 产品测试：检验项目编码
+ /// </summary>
+ public string TEST_CODE { get; set; }
+ /// <summary>
+ /// 产品抽检：抽样规则编码
+ /// </summary>
+ public string SAPL_CODE { get; set; }
+ /// <summary>
+ /// 标签打印：标签模板编码
+ /// </summary>
+ public string LABEL_CODE { get; set; }
+ /// <summary>
+ /// 设置值1
+ /// </summary>
+ public string OPTION_1 { get; set; }
+ /// <summary>
+ /// 设置值2
+ /// </summary>
+ public string OPTION_2 { get; set; }
+ /// <summary>
+ /// 设置值3
+ /// </summary>
+ public string OPTION_3 { get; set; }
+ /// <summary>
+ /// 设置值4
+ /// </summary>
+ public string OPTION_4 { get; set; }
+ /// <summary>
+ /// 设置值5
+ /// </summary>
+ public string OPTION_5 { 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是MES_PROD_NODE_ACT类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_NODE_ACTId))]//ClassA表中的MES_PROD_NODE_ACTId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_NODE_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_POST.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_POST.cs
new file mode 100644
index 0000000..fa0351c
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_POST.cs
@@ -0,0 +1,74 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋锛氬伐搴忚妭鐐逛笌宀椾綅鍏崇郴
+ /// </summary>
+ [Description("Primary:NODE_ID,POST_CODE")]
+ [Serializable]
+ [SugarTable("MES_ROUTE_NODE_POST")]
+ public class MES_ROUTE_NODE_POST : iDBEntity
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氬伐搴忚妭鐐逛笌宀椾綅鍏崇郴
+ /// </summary>
+ public MES_ROUTE_NODE_POST() {}
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 涓婚敭 宸ュ簭鑺傜偣ID
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 涓婚敭 宀椾綅缂栫爜
+ /// </summary>
+ public string POST_CODE { get; set; }
+ #endregion
+
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_ROUTE_NODE_POST绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_ROUTE_NODE_POSTId))]//ClassA琛ㄤ腑鐨凪ES_ROUTE_NODE_POSTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_ROUTE_NODE_POSTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ */
+ #endregion
+
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
+ public enum FieldNames
+ {
+ [Description("鏋氫妇鎻忚堪0")]
+ Enum0,
+ [Description("鏋氫妇鎻忚堪1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 鍏叡鏂规硶
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PERIOD.cs b/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PERIOD.cs
deleted file mode 100644
index 2aa3fe7..0000000
--- a/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PERIOD.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using SqlSugar;
-using System.Linq;
-using System.ComponentModel;
-using System.Collections.Generic;
-
-namespace Tiger.Model
-{
- /// <summary>
- /// 实体：班次时段
- /// </summary>
- [Description("Primary:ID")]
- [Serializable]
- [SugarTable("MES_SHIFT_PERIOD")]
- public class MES_SHIFT_PERIOD : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：班次时段
- /// </summary>
- public MES_SHIFT_PERIOD() {}
- #endregion
-
- #region 公共属性
- /// <summary>
- /// 时段编码
- /// </summary>
- public string PRD_CODE { get; set; }
- /// <summary>
- /// 时段名称
- /// </summary>
- public string PRD_NAME { get; set; }
- /// <summary>
- /// 班次编码
- /// </summary>
- public string SFT_CODE { get; set; }
- /// <summary>
- /// 时段开始时间
- /// </summary>
- public int SFT_BEGIN { get; set; }
- /// <summary>
- /// 时段结束时间
- /// </summary>
- public int SFT_END { get; set; }
- /// <summary>
- /// 时段排序
- /// </summary>
- public int SEQ { get; set; }
- /// <summary>
- /// 是否跨天(Y/N)
- /// </summary>
- public string IS_ACROSS_DAY { 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是MES_SHIFT_PERIOD类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_SHIFT_PERIODId))]//ClassA表中的MES_SHIFT_PERIODId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_SHIFT_PERIODId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
- */
- #endregion
-
- #region 枚举变量
- /*例子
- public enum FieldNames
- {
- [Description("枚举描述0")]
- Enum0,
- [Description("枚举描述1")]
- Enum1,
- }
- */
- #endregion
-
- #region 公共方法
-
- #endregion
-
- }//endClass
-}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PRD.cs b/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PRD.cs
index 962b01f..5a6e83f 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PRD.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_SHIFT_PRD.cs
@@ -12,7 +12,7 @@
[Description("Primary:ID")]
[Serializable]
[SugarTable("MES_SHIFT_PRD")]
- public class MES_SHIFT_PRD : DbEntity
+ public class MES_SHIFT_PRD : DbEntityWithAuth
{
#region 构造函数
/// <summary>
@@ -23,7 +23,7 @@
#region 公共属性
/// <summary>
- /// 时段代码
+ /// 时段编码
/// </summary>
public string PRD_CODE { get; set; }
/// <summary>
@@ -31,17 +31,17 @@
/// </summary>
public string PRD_NAME { get; set; }
/// <summary>
- /// 班次代码
+ /// 班次编码
/// </summary>
public string SFT_CODE { get; set; }
/// <summary>
/// 时段开始时间
/// </summary>
- public int SFT_BEGIN { get; set; }
+ public int PRD_BEGIN { get; set; }
/// <summary>
/// 时段结束时间
/// </summary>
- public int SFT_END { get; set; }
+ public int PRD_END { get; set; }
/// <summary>
/// 时段排序
/// </summary>
@@ -49,7 +49,11 @@
/// <summary>
/// 是否跨天(Y/N)
/// </summary>
- public string IS_ACROSS_DAY { get; set; }
+ public string IS_ACROSS { get; set; }
+ /// <summary>
+ /// 是否休息时段(Y/N)
+ /// </summary>
+ public string IS_REST { get; set; }
/// <summary>
/// 备注
/// </summary>
@@ -63,6 +67,20 @@
*/
#endregion
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_SHIFT_PRD类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_SHIFT_PRDId))]//ClassA表中的MES_SHIFT_PRDId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_SHIFT_PRDId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
#region 枚举变量
/*例子
public enum FieldNames
diff --git a/Tiger.Model.Net/Entitys/MES/MES_SMT_TABLE.cs b/Tiger.Model.Net/Entitys/MES/MES_SMT_TABLE.cs
deleted file mode 100644
index 366a90e..0000000
--- a/Tiger.Model.Net/Entitys/MES/MES_SMT_TABLE.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using SqlSugar;
-using System.Linq;
-using System.ComponentModel;
-using System.Collections.Generic;
-
-namespace Tiger.Model
-{
- /// <summary>
- /// 实体：工单料站表
- /// </summary>
- [Description("Primary:ID")]
- [Serializable]
- [SugarTable("MES_SMT_TABLE")]
- public class MES_SMT_TABLE : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：工单料站表
- /// </summary>
- public MES_SMT_TABLE() {}
- #endregion
-
- #region 公共属性
- /// <summary>
- /// 关联工单号
- /// </summary>
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 物料编码
- /// </summary>
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 替代料
- /// </summary>
- public string SUBITEM_CODE { get; set; }
- /// <summary>
- /// 单位
- /// </summary>
- public string UNIT { get; set; }
- /// <summary>
- /// 单位用量
- /// </summary>
- public int UNIT_QTY { get; set; }
- /// <summary>
- /// 产线编码
- /// </summary>
- public string LINE_NO { get; set; }
- /// <summary>
- /// 贴片机序号
- /// </summary>
- public string SMT_NO { get; set; }
- /// <summary>
- /// 站位号
- /// </summary>
- public string STATION_NO { get; set; }
- /// <summary>
- /// 飞达号
- /// </summary>
- public string FEEDER_NO { get; set; }
- /// <summary>
- /// 料枪类型
- /// </summary>
- public string FEEDER_TYPE { get; set; }
- /// <summary>
- /// 上料顺序
- /// </summary>
- public int LOAD_SEQ { get; set; }
- /// <summary>
- /// 加工面
- /// </summary>
- public string PCB_SURFACE { 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是MES_SMT_TABLE类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_SMT_TABLEId))]//ClassA表中的MES_SMT_TABLEId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_SMT_TABLEId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
- */
- #endregion
-
- #region 枚举变量
- /*例子
- public enum FieldNames
- {
- [Description("枚举描述0")]
- Enum0,
- [Description("枚举描述1")]
- Enum1,
- }
- */
- #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
new file mode 100644
index 0000000..68de4cc
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
@@ -0,0 +1,181 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+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
+
+ #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标签打印)
+ /// </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 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #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
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #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
new file mode 100644
index 0000000..9edf1af
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -0,0 +1,197 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+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
+
+ #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 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #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
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #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
new file mode 100644
index 0000000..77032c6
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
@@ -0,0 +1,201 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+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
+
+ #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 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #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
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 487906d..42f5723 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -91,8 +91,15 @@
<Compile Include="Entitys\MES\C_Stock_Info_t.cs" />
<Compile Include="Entitys\MES\C_Stock_Pallet_T.cs" />
<Compile Include="Entitys\MES\edge.cs" />
+ <Compile Include="Entitys\MES\MES_PROD_NODE_ACT.cs" />
<Compile Include="Entitys\MES\MES_ROUTE_NODE_ACT.cs" />
- <Compile Include="Entitys\MES\MES_SHIFT_PERIOD.cs" />
+ <Compile Include="Entitys\MES\MES_ROUTE_NODE_POST.cs" />
+ <Compile Include="Entitys\MES\MES_SHIFT.cs" />
+ <Compile Include="Entitys\MES\MES_SHIFT_PRD.cs" />
+ <Compile Include="Entitys\MES\MES_SHIFT_SYS.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_ACT.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_DATA.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_HIS.cs" />
<Compile Include="Entitys\MES\node.cs" />
<Compile Include="Entitys\MES\R_Wip_Tracking_T.cs" />
<Compile Include="Entitys\MES\SMT_FEEDER.cs" />
@@ -229,10 +236,6 @@
<Compile Include="Entitys\MES\MES_ROUTE.cs" />
<Compile Include="Entitys\MES\MES_ROUTE_EDGE.cs" />
<Compile Include="Entitys\MES\MES_ROUTE_NODE.cs" />
- <Compile Include="Entitys\MES\MES_SHIFT.cs" />
- <Compile Include="Entitys\MES\MES_SHIFT_PRD.cs" />
- <Compile Include="Entitys\MES\MES_SHIFT_SYS.cs" />
- <Compile Include="Entitys\MES\MES_SMT_TABLE.cs" />
<Compile Include="Entitys\MES\MES_WORKSHOP.cs" />
<Compile Include="Entitys\MES\V_PROD_TREE.cs" />
<Compile Include="Entitys\MES\V_PROD_UNIT.cs" />
--
Gitblit v1.9.3