From 53171273a4cd9049d532f031f389364982d219d7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 12 七月 2024 15:18:24 +0800
Subject: [PATCH] 更新实体
---
Tiger.Model.Net/Entitys/MES/MES_WO_NODE_POST.cs | 89 ++
Tiger.Model.Net/Entitys/SYS/USER.cs | 2
Tiger.Model.Net/Tiger.Model.Net.csproj | 6
Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs | 38
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 34
Tiger.Model.Net/Entitys/BAS/BAS_DEFECT_GRP.cs | 72
Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs | 76 +
Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 565 ++++++------
Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs | 482 +++++-----
Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 554 +++++++-----
Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs | 28
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 528 ++++++-----
Tiger.Model.Net/Entitys/MES/MES_WO_NODE_DFTG.cs | 89 ++
Tiger.Model.Net/Entitys/Api/Base.cs | 27
14 files changed, 1,513 insertions(+), 1,077 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/Api/Base.cs b/Tiger.Model.Net/Entitys/Api/Base.cs
new file mode 100644
index 0000000..97ec4ea
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/Api/Base.cs
@@ -0,0 +1,27 @@
+锘縰sing System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ public class ApiInput
+ {
+ /// <summary>
+ ///鏁版嵁搴撴巿鏉冩煡璇㈤�夐」
+ /// </summary>
+ public AuthOption AuthOption { get; set; }
+ }
+
+ public class BsPageInput : ApiInput
+ {
+ public int pageIndex { get; set; }
+ public int pageSize { get; set; }
+ public int total { get; set; }
+ public string Code { get; set; }
+ }
+
+ public class BsPageOutput<T>
+ {
+ public List<T> data { get; set; }
+ public int total { get; set; }
+ }
+
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_DEFECT_GRP.cs b/Tiger.Model.Net/Entitys/BAS/BAS_DEFECT_GRP.cs
index 31900ba..3388105 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_DEFECT_GRP.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_DEFECT_GRP.cs
@@ -7,75 +7,77 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：不良代码组
+ /// 瀹炰綋锛氫笉鑹唬鐮佺粍
/// </summary>
[Description("Primary:ID")]
- [DisplayName("不良代码组")]
+ [DisplayName("涓嶈壇浠ｇ爜缁�")]
[Serializable]
[SugarTable("BAS_DEFECT_GRP")]
public class BAS_DEFECT_GRP : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：不良代码组
+ /// 瀹炰綋锛氫笉鑹唬鐮佺粍
/// </summary>
public BAS_DEFECT_GRP() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 不良代码组编码
+ /// 涓嶈壇浠ｇ爜缁勭紪鐮�
/// </summary>
- [DisplayName("不良代码组编码")]
+ [DisplayName("涓嶈壇浠ｇ爜缁勭紪鐮�")]
public string DFTG_CODE { get; set; }
/// <summary>
- /// 不良代码组名称
+ /// 涓嶈壇浠ｇ爜缁勫悕绉�
/// </summary>
- [DisplayName("不良代码组名称")]
+ [DisplayName("涓嶈壇浠ｇ爜缁勫悕绉�")]
public string DFTG_NAME { get; set; }
/// <summary>
- /// 备注
+ /// 澶囨敞
/// </summary>
- [DisplayName("备注")]
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_DEFECT_GRP类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_DEFECT_GRPId))]//ClassA表中的BAS_DEFECT_GRPId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_DEFECT_GRPId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊AS_DEFECT_GRP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_DEFECT_GRPId))]//ClassA琛ㄤ腑鐨凚AS_DEFECT_GRPId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_DEFECT_GRPId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ [Navigate(NavigateType.OneToMany, nameof(BAS_DEFECT.DFTG_CODE), nameof(DFTG_CODE), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凚AS_DEFECT_GRPId
+ public List<BAS_DEFECT> Defects { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
- #endregion
+ #endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
index ad5aeda..911a867 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
@@ -6,303 +6,308 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氬伐鍗�
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("宸ュ崟")]
- [Serializable]
- [SugarTable("BIZ_MES_WO")]
- public class BIZ_MES_WO : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氬伐鍗�
- /// </summary>
- public BIZ_MES_WO() { }
- #endregion
+ /// <summary>
+ /// 实体：工单
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("工单")]
+ [Serializable]
+ [SugarTable("BIZ_MES_WO")]
+ public class BIZ_MES_WO : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：工单
+ /// </summary>
+ public BIZ_MES_WO() {}
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [DisplayName("宸ュ崟鍙�")]
- public string ORDER_NO { get; set; }
- /// <summary>
- /// 宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5濮斿Outsourcing|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)
- /// </summary>
- [DisplayName("宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)")]
- public string ORDER_TYPE { get; set; }
- /// <summary>
- /// 宸ュ崟鎻忚堪
- /// </summary>
- [DisplayName("宸ュ崟鎻忚堪")]
- public string ORDER_DESC { get; set; }
- /// <summary>
- /// 鐖跺伐鍗�
- /// </summary>
- [DisplayName("鐖跺伐鍗�")]
- public string PARENT_ORDER { get; set; }
- /// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)
- /// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- [DisplayName("鐗╂枡绫诲瀷")]
- public string ITEM_TYPE { get; set; }
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- [DisplayName("鏈哄瀷")]
- public string ITEM_MODEL { get; set; }
- /// <summary>
- /// 浼樺厛绾�
- /// </summary>
- [DisplayName("浼樺厛绾�")]
- public string PRIORITY { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- [DisplayName("瀹㈡埛缂栫爜")]
- public string CUST_CODE { get; set; }
- /// <summary>
- /// 璺敱缂栫爜
- /// </summary>
- [DisplayName("璺敱缂栫爜")]
- public string ROUTE_CODE { get; set; }
- /// <summary>
- /// 宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)
- /// </summary>
- [DisplayName("宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)")]
- public int ROUTE_STATUS { get; set; }
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [DisplayName("宸ュ巶")]
- public string FACTORY { get; set; }
- /// <summary>
- /// 杞﹂棿缂栫爜
- /// </summary>
- [DisplayName("杞﹂棿缂栫爜")]
- public string WS_CODE { get; set; }
- /// <summary>
- /// 璁″垝绾夸綋
- /// </summary>
- [DisplayName("璁″垝绾夸綋")]
- public string PLAN_LINE { get; set; }
- /// <summary>
- /// 瀹為檯绾夸綋
- /// </summary>
- [DisplayName("瀹為檯绾夸綋")]
- public string ACT_LINE { get; set; }
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [DisplayName("璁″垝寮�濮嬫椂闂�")]
- public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 璁″垝缁撴潫鏃堕棿
- /// </summary>
- [DisplayName("璁″垝缁撴潫鏃堕棿")]
- public DateTime PLAN_END_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 瀹為檯寮�濮嬫椂闂�
- /// </summary>
- [DisplayName("瀹為檯寮�濮嬫椂闂�")]
- public DateTime ACT_START_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 瀹為檯缁撴潫鏃堕棿
- /// </summary>
- [DisplayName("瀹為檯缁撴潫鏃堕棿")]
- public DateTime ACT_END_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鏍囧噯浣滀笟浜烘暟
- /// </summary>
- [DisplayName("鏍囧噯浣滀笟浜烘暟")]
- public int STD_WORKER_QTY { get; set; }
- /// <summary>
- /// 瀹為檯浣滀笟浜烘暟
- /// </summary>
- [DisplayName("瀹為檯浣滀笟浜烘暟")]
- public int ACT_WORKER_QTY { get; set; }
- /// <summary>
- /// 瀵煎叆鏃堕棿
- /// </summary>
- [DisplayName("瀵煎叆鏃堕棿")]
- public DateTime IMPORT_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 涓嬪彂鏃堕棿
- /// </summary>
- [DisplayName("涓嬪彂鏃堕棿")]
- public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 涓嬪彂浜�
- /// </summary>
- [DisplayName("涓嬪彂浜�")]
- public string RELEASE_USER { get; set; }
- /// <summary>
- /// 鍙樻洿鏃堕棿
- /// </summary>
- [DisplayName("鍙樻洿鏃堕棿")]
- public DateTime CHANGE_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鍙樻洿浜�
- /// </summary>
- [DisplayName("鍙樻洿浜�")]
- public string CHANGE_USER { get; set; }
- /// <summary>
- /// 璁″垝鏁伴噺
- /// </summary>
- [DisplayName("璁″垝鏁伴噺")]
- public int PLAN_QTY { get; set; }
- /// <summary>
- /// 鎶曞叆鏁伴噺
- /// </summary>
- [DisplayName("鎶曞叆鏁伴噺")]
- public int INPUT_QTY { get; set; }
- /// <summary>
- /// 瀹屽伐鏁伴噺
- /// </summary>
- [DisplayName("瀹屽伐鏁伴噺")]
- public int OUTPUT_QTY { get; set; }
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- [DisplayName("鎶ュ簾鏁伴噺")]
- public int SCRAP_QTY { get; set; }
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [DisplayName("鍏ュ簱鏁伴噺")]
- public int STOCK_IN_QTY { get; set; }
- /// <summary>
- /// UPH
- /// </summary>
- [DisplayName("UPH")]
- public double UPH { get; set; }
- /// <summary>
- /// UPPH
- /// </summary>
- [DisplayName("UPPH")]
- public double UPPH { get; set; }
- /// <summary>
- /// 鏈�鍚庣殑宸ュ崟鍘嗗彶ID
- /// </summary>
- [DisplayName("鏈�鍚庣殑宸ュ崟鍘嗗彶ID")]
- public string LAST_HIST_ID { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
- public string REMARK { get; set; }
- /// <summary>
- /// 鎺ュ彛琛ㄨ褰旾D
- /// </summary>
- [DisplayName("鎺ュ彛琛ㄨ褰旾D")]
- public string FBILLNO_ID { get; set; }
- /// <summary>
- /// 澶囨枡鍗曡繑鍥炰俊鎭�
- /// </summary>
- [DisplayName("澶囨枡鍗曡繑鍥炰俊鎭�")]
- public string PREP_MSG { get; set; }
- #endregion
+ #region 公共属性
+ /// <summary>
+ /// 工单号
+ /// </summary>
+ [DisplayName("工单号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 工单类型(0Plan计划|1Standard标准|2Rework返工|3Restructuring在库改制|5委外Outsourcing|6RD研发|7Forecast预测|8Disassemble拆卸)
+ /// </summary>
+ [DisplayName("工单类型(0Plan计划|1Standard标准|2Rework返工|3Restructuring在库改制|5委外Outsourcing|6RD研发|7Forecast预测|8Disassemble拆卸)")]
+ public int ORDER_TYPE { get; set; }
+ /// <summary>
+ /// 工单描述
+ /// </summary>
+ [DisplayName("工单描述")]
+ public string ORDER_DESC { get; set; }
+ /// <summary>
+ /// 父工单
+ /// </summary>
+ [DisplayName("父工单")]
+ public string PARENT_ORDER { get; set; }
+ /// <summary>
+ /// 状态(0Init初始化|1Imported已导入|2Release已下发|3Working生产中|4Paused已暂停|5Closed已关闭)
+ /// </summary>
+ [DisplayName("状态(0Init初始化|1Imported已导入|2Release已下发|3Working生产中|4Paused已暂停|5Closed已关闭)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 物料编码
+ /// </summary>
+ [DisplayName("物料编码")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 物料类型
+ /// </summary>
+ [DisplayName("物料类型")]
+ public string ITEM_TYPE { get; set; }
+ /// <summary>
+ /// 机型
+ /// </summary>
+ [DisplayName("机型")]
+ public string ITEM_MODEL { get; set; }
+ /// <summary>
+ /// 优先级
+ /// </summary>
+ [DisplayName("优先级")]
+ public string PRIORITY { get; set; }
+ /// <summary>
+ /// 客户编码
+ /// </summary>
+ [DisplayName("客户编码")]
+ public string CUST_CODE { get; set; }
+ /// <summary>
+ /// 路由编码
+ /// </summary>
+ [DisplayName("路由编码")]
+ public string ROUTE_CODE { get; set; }
+ /// <summary>
+ /// 工艺状态(0WaitSet待配置|1Finish已配置|2Cancel取消|3Close关闭)
+ /// </summary>
+ [DisplayName("工艺状态(0WaitSet待配置|1Finish已配置|2Cancel取消|3Close关闭)")]
+ public int ROUTE_STATUS { get; set; }
+ /// <summary>
+ /// 工厂
+ /// </summary>
+ [DisplayName("工厂")]
+ public string FACTORY { get; set; }
+ /// <summary>
+ /// 车间编码
+ /// </summary>
+ [DisplayName("车间编码")]
+ public string WS_CODE { get; set; }
+ /// <summary>
+ /// 计划线体
+ /// </summary>
+ [DisplayName("计划线体")]
+ public string PLAN_LINE { get; set; }
+ /// <summary>
+ /// 实际线体
+ /// </summary>
+ [DisplayName("实际线体")]
+ public string ACT_LINE { get; set; }
+ /// <summary>
+ /// 计划开始时间
+ /// </summary>
+ [DisplayName("计划开始时间")]
+ public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 计划结束时间
+ /// </summary>
+ [DisplayName("计划结束时间")]
+ public DateTime PLAN_END_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 实际开始时间
+ /// </summary>
+ [DisplayName("实际开始时间")]
+ public DateTime ACT_START_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 实际结束时间
+ /// </summary>
+ [DisplayName("实际结束时间")]
+ public DateTime ACT_END_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 标准作业人数
+ /// </summary>
+ [DisplayName("标准作业人数")]
+ public int STD_WORKER_QTY { get; set; }
+ /// <summary>
+ /// 实际作业人数
+ /// </summary>
+ [DisplayName("实际作业人数")]
+ public int ACT_WORKER_QTY { get; set; }
+ /// <summary>
+ /// 导入时间
+ /// </summary>
+ [DisplayName("导入时间")]
+ public DateTime IMPORT_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 下发时间
+ /// </summary>
+ [DisplayName("下发时间")]
+ public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 下发人
+ /// </summary>
+ [DisplayName("下发人")]
+ public string RELEASE_USER { get; set; }
+ /// <summary>
+ /// 变更时间
+ /// </summary>
+ [DisplayName("变更时间")]
+ public DateTime CHANGE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 变更人
+ /// </summary>
+ [DisplayName("变更人")]
+ public string CHANGE_USER { get; set; }
+ /// <summary>
+ /// 计划数量
+ /// </summary>
+ [DisplayName("计划数量")]
+ public int PLAN_QTY { get; set; }
+ /// <summary>
+ /// 投入数量
+ /// </summary>
+ [DisplayName("投入数量")]
+ public int INPUT_QTY { get; set; }
+ /// <summary>
+ /// 完工数量
+ /// </summary>
+ [DisplayName("完工数量")]
+ public int OUTPUT_QTY { get; set; }
+ /// <summary>
+ /// 报废数量
+ /// </summary>
+ [DisplayName("报废数量")]
+ public int SCRAP_QTY { get; set; }
+ /// <summary>
+ /// 入库数量
+ /// </summary>
+ [DisplayName("入库数量")]
+ public int STOCK_IN_QTY { get; set; }
+ /// <summary>
+ /// UPH
+ /// </summary>
+ [DisplayName("UPH")]
+ public double UPH { get; set; }
+ /// <summary>
+ /// UPPH
+ /// </summary>
+ [DisplayName("UPPH")]
+ public double UPPH { get; set; }
+ /// <summary>
+ /// 最后的工单历史ID
+ /// </summary>
+ [DisplayName("最后的工单历史ID")]
+ public string LAST_HIST_ID { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 接口表记录ID
+ /// </summary>
+ [DisplayName("接口表记录ID")]
+ public string FBILLNO_ID { get; set; }
+ /// <summary>
+ /// 备料单返回信息
+ /// </summary>
+ [DisplayName("备料单返回信息")]
+ public string PREP_MSG { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
- //涓�瀵逛竴澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
- public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //涓�瀵瑰澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_MES_WOId))]//ClassA琛ㄤ腑鐨凚IZ_MES_WOId
- public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //澶氬澶氬閿鑸�
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WOId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
- public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #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
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
- [Description("鏋氫妇鎻忚堪0")]
+ [Description("枚举描述0")]
Enum0,
- [Description("鏋氫妇鎻忚堪1")]
+ [Description("枚举描述1")]
Enum1,
}
*/
- public enum STATUSs
- {
- [Description("鍒濆鍖�")]
- Init,
- [Description("宸插鍏�")]
- Imported,
- [Description("宸蹭笅鍙�")]
- Release,
- [Description("鐢熶骇涓�")]
- Working,
- [Description("宸叉殏鍋�")]
- Paused,
- [Description("宸插叧闂�")]
- Closed,
- }
- /// <summary>
- /// 鏋氫妇锛氬伐鑹虹姸鎬�(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)
- /// </summary>
- public enum ROUTE_STATUSs
- {
- [Description("寰呴厤缃�")]
- WaitSet,
- [Description("宸查厤缃�")]
- Finish,
- [Description("鍙栨秷")]
- Cancel,
- [Description("宸插叧闂�")]
- Closed,
- }
+ /// <summary>
+ /// 枚举：工单类型(0Plan计划|1Standard标准|2Rework返工|3Restructuring在库改制|5委外Outsourcing|6RD研发|7Forecast预测|8Disassemble拆卸)
+ /// </summary>
+ public enum ORDER_TYPEs
+ {
+ [Description("计划")]
+ Plan = 0,
+ [Description("标准")]
+ Standard = 1,
+ [Description("返工")]
+ Rework = 2,
+ [Description("在库改制")]
+ Restructuring = 3,
+ [Description("Outsourcing")]
+ Outsourcing = 5委外,
+ [Description("研发")]
+ RD = 6,
+ [Description("预测")]
+ Forecast = 7,
+ [Description("拆卸")]
+ Disassemble = 8,
+ }
- /// <summary>
- /// 宸ュ崟绫诲瀷鏋氫妇
- /// </summary>
- public enum ORDER_TYPEs {
- [Description("璁″垝")]
- Plan=0,
- [Description("鏍囧噯")]
- Standard=1,
- [Description("杩斿伐")]
- Rework=2,
- [Description("鍦ㄥ簱鏀瑰埗")]
- Restructuring=3,
- [Description("濮斿")]
- Outsourcing = 5,
- [Description("鐮斿彂")]
- RD = 6,
- [Description("棰勬祴")]
- Forecast = 7,
- [Description("鎷嗗嵏")]
- Disassemble = 8,
- }
- #endregion
+ /// <summary>
+ /// 枚举：状态(0Init初始化|1Imported已导入|2Release已下发|3Working生产中|4Paused已暂停|5Closed已关闭)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("初始化")]
+ Init = 0,
+ [Description("已导入")]
+ Imported = 1,
+ [Description("已下发")]
+ Release = 2,
+ [Description("生产中")]
+ Working = 3,
+ [Description("已暂停")]
+ Paused = 4,
+ [Description("已关闭")]
+ Closed = 5,
+ }
- #region 鍏叡鏂规硶
+ /// <summary>
+ /// 枚举：工艺状态(0WaitSet待配置|1Finish已配置|2Cancel取消|3Close关闭)
+ /// </summary>
+ public enum ROUTE_STATUSs
+ {
+ [Description("待配置")]
+ WaitSet = 0,
+ [Description("已配置")]
+ Finish = 1,
+ [Description("取消")]
+ Cancel = 2,
+ [Description("关闭")]
+ Close = 3,
+ }
+ #endregion
- #endregion
+ #region 公共方法
- }//endClass
+ #endregion
+
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs
index 31d5285..b4553c0 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs
@@ -33,10 +33,10 @@
/// </summary>
[DisplayName("鏉＄爜")]
public string SN { get; set; }
- /// <summary>
- /// 鐘舵��(0NotInput鏈姇鍏1Inputed宸叉姇鍏�)
- /// </summary>
- [DisplayName("鐘舵��(0NotInput鏈姇鍏1Inputed宸叉姇鍏�)")]
+ /// <summary>
+ /// 鐘舵��(0NotInput鏈姇鍏1Inputed宸叉姇鍏2Finished宸插畬宸�)
+ /// </summary>
+ [DisplayName("鐘舵��(0NotInput鏈姇鍏1Inputed宸叉姇鍏2Finished宸插畬宸�)")]
public int STATUS { get; set; }
/// <summary>
/// 宸ュ崟鎵规鍙�
@@ -48,17 +48,17 @@
/// </summary>
[DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO_SN绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -69,10 +69,10 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WO_SNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -82,16 +82,18 @@
}
*/
- /// <summary>
- /// 鏋氫妇锛氱姸鎬�(0NotInput鏈姇鍏1Inputed宸叉姇鍏�)
- /// </summary>
- public enum STATUSs
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0NotInput鏈姇鍏1Inputed宸叉姇鍏2Finished宸插畬宸�)
+ /// </summary>
+ public enum STATUSs
{
[Description("鏈姇鍏�")]
NotInput = 0,
[Description("宸叉姇鍏�")]
Inputed = 1,
- }
+ [Description("宸插畬宸�")]
+ Finished = 2,
+ }
#endregion
#region 鍏叡鏂规硶
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
index fadf907..de28a3c 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
@@ -6,259 +6,269 @@
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
- /// </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 公共属性
+ /// <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 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 澶栭敭灞炴��
- /*渚嬪瓙
- //涓�瀵逛竴澶栭敭瀵艰埅
- [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
+ #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
+ #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
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index 74df14f..32c922c 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -6,277 +6,297 @@
namespace Tiger.Model
{
- /// <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
+ /// <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>
- [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 公共属性
+ /// <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>
+ /// 工厂编码
+ /// </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>
+ /// 是否完工
+ /// </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>
+ /// 不良代码编码
+ /// </summary>
+ [DisplayName("不良代码编码")]
+ public string DFT_CODE { 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鏄疢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
+ #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
+ #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>
- /// 鏋氫妇锛氭娊妫�鐘舵��(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
+ /// <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
- #region 鍏叡鏂规硶
+ #region 公共方法
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs
new file mode 100644
index 0000000..7378531
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs
@@ -0,0 +1,76 @@
+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("MES_WIP_EXT")]
+ public class MES_WIP_EXT : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：在制品扩展信息表
+ /// </summary>
+ public MES_WIP_EXT() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 过站条码
+ /// </summary>
+ [DisplayName("过站条码")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 彩盒条码
+ /// </summary>
+ [DisplayName("彩盒条码")]
+ public string BOX_SN { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_EXT类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_EXTId))]//ClassA表中的MES_WIP_EXTId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_EXTId), 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
index f1a49f2..952194c 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
@@ -6,20 +6,74 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("鐢熶骇杩囩▼璁板綍")]
- [Serializable]
- [SugarTable("MES_WIP_HIS")]
- public class MES_WIP_HIS : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇杩囩▼璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_HIS")]
+ public class MES_WIP_HIS : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
+ /// </summary>
+ public MES_WIP_HIS() {}
+
/// <summary>
- /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
+ /// 瀹炰綋锛氬簱瀛樺巻鍙�
/// </summary>
- public MES_WIP_HIS() { }
+ /// <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;
+ SN = data.SN;
+ STATUS = data.STATUS;
+ ITEM_CODE = data.ITEM_CODE;
+ 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;
+ FINISHED_FLAG = data.FINISHED_FLAG;
+ DFT_FLAG = data.DFT_FLAG;
+ DFT_COUNT = data.DFT_COUNT;
+ DFT_CODE = data.DFT_CODE;
+ TRAY_SN = data.TRAY_SN;
+ CONTAINER_SN = data.CONTAINER_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 鍏叡灞炴��
@@ -27,188 +81,208 @@
/// 杩囩珯鏉＄爜
/// </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
+ 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>
+ /// 宸ュ巶缂栫爜
+ /// </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>
+ /// 鏄惁瀹屽伐
+ /// </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>
+ /// 涓嶈壇浠ｇ爜缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
+ public string DFT_CODE { 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 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_HIS绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -219,10 +293,10 @@
[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")]
@@ -232,56 +306,56 @@
}
*/
- /// <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>
- /// 鏋氫妇锛氭娊妫�鐘舵��(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
+ /// <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
- #region 鍏叡鏂规硶
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
index ff744e5..cb554d1 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
@@ -128,17 +128,17 @@
/// </summary>
[DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -149,10 +149,12 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ [Navigate(NavigateType.OneToOne, nameof(ACT_CODE), nameof(MES_CUSTOM_ACT.ACT_CODE))]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public MES_CUSTOM_ACT Action { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -162,10 +164,10 @@
}
*/
- /// <summary>
- /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
- /// </summary>
- public enum ACT_TYPEs
+ /// <summary>
+ /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </summary>
+ public enum ACT_TYPEs
{
[Description("鑷畾涔夎涓�")]
Normal = 0,
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_DFTG.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_DFTG.cs
new file mode 100644
index 0000000..66e6a4b
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_DFTG.cs
@@ -0,0 +1,89 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：工单工序与不良代码组关系
+ /// </summary>
+ [Description("Primary:WORK_ORDER,NODE_ID,DFTG_CODE")]
+ [DisplayName("工单工序与不良代码组关系")]
+ [Serializable]
+ [SugarTable("MES_WO_NODE_DFTG")]
+ public class MES_WO_NODE_DFTG : iDBEntity
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：工单工序与不良代码组关系
+ /// </summary>
+ public MES_WO_NODE_DFTG() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 主键 关联工单号
+ /// </summary>
+ [DisplayName("关联工单号")]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 主键 工序节点ID
+ /// </summary>
+ [DisplayName("工序节点ID")]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 主键 不良代码组编码
+ /// </summary>
+ [DisplayName("不良代码组编码")]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string DFTG_CODE { 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是MES_WO_NODE_DFTG类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODE_DFTGId))]//ClassA表中的MES_WO_NODE_DFTGId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_DFTGId), 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_WO_NODE_POST.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_POST.cs
new file mode 100644
index 0000000..d8fa3d3
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_POST.cs
@@ -0,0 +1,89 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 瀹炰綋锛氬伐鍗曞伐搴忎笌宀椾綅鍏崇郴
+ /// </summary>
+ [Description("Primary:WORK_ORDER,NODE_ID,POST_CODE")]
+ [DisplayName("宸ュ崟宸ュ簭涓庡矖浣嶅叧绯�")]
+ [Serializable]
+ [SugarTable("MES_WO_NODE_POST")]
+ public class MES_WO_NODE_POST : iDBEntity
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氬伐鍗曞伐搴忎笌宀椾綅鍏崇郴
+ /// </summary>
+ public MES_WO_NODE_POST() {}
+ #endregion
+
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 涓婚敭 鍏宠仈宸ュ崟鍙�
+ /// </summary>
+ [DisplayName("鍏宠仈宸ュ崟鍙�")]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 涓婚敭 宸ュ簭鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ュ簭鑺傜偣ID")]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 涓婚敭 宀椾綅缂栫爜
+ /// </summary>
+ [DisplayName("宀椾綅缂栫爜")]
+ [SugarColumn(IsPrimaryKey = true)]
+ public string POST_CODE { 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鏄疢ES_WO_NODE_POST绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODE_POSTId))]//ClassA琛ㄤ腑鐨凪ES_WO_NODE_POSTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_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/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
new file mode 100644
index 0000000..233eea7
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tiger.Model.Entitys.MES.Position
+{
+ public class NewPositionInput
+ {
+ public string USER_CODE { get; set; }
+ public string POST_CODE { get; set; }
+ }
+
+ public class WoInput : ApiInput
+ {
+ public string OrderNo { get; set; }
+ }
+
+ public class SnInput : ApiInput
+ {
+ public string SN { get; set; }
+ public string DFT_CODE { get; set; }
+ }
+
+ public class DefectOutput
+ {
+ public string DFTG_CODE { get; set; }
+ public string DFTG_NAME { get; set; }
+ public string DFT_CODE { get; set; }
+ public string DFT_NAME { get; set; }
+ public int DFT_LEVEL { get; set; }
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/SYS/USER.cs b/Tiger.Model.Net/Entitys/SYS/USER.cs
index 47710e1..e26c449 100644
--- a/Tiger.Model.Net/Entitys/SYS/USER.cs
+++ b/Tiger.Model.Net/Entitys/SYS/USER.cs
@@ -21,7 +21,7 @@
}
public string ORG_CODE { get; set; }
-
+ public string POST_CODE { get; set; }
public string FTY_CODE { get; set; }
public string PROD_CODE { get; set; }
public string Token { get; set; }
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index b148c18..bf91b83 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -70,6 +70,7 @@
<ItemGroup>
<Compile Include="Base\DbEntityBase.cs" />
<Compile Include="DTO\MESDTO.cs" />
+ <Compile Include="Entitys\Api\Base.cs" />
<Compile Include="Entitys\Automate\SNInfo.cs" />
<Compile Include="Entitys\Automate\Vechicle.cs" />
<Compile Include="Entitys\Automate\WIP_SN.cs" />
@@ -104,6 +105,7 @@
<Compile Include="Entitys\DigitalTwin\Sharetronic\ShelfApiResult.cs" />
<Compile Include="Entitys\MES\BIZ_MES_WO.cs" />
<Compile Include="Entitys\MES\BIZ_MES_WO_BATCH.cs" />
+ <Compile Include="Entitys\MES\BIZ_MES_WO_SN.cs" />
<Compile Include="Entitys\MES\C_Stock_Info_t.cs" />
<Compile Include="Entitys\MES\C_Stock_Pallet_T.cs" />
<Compile Include="Entitys\MES\edge.cs" />
@@ -118,15 +120,19 @@
<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_EXT.cs" />
<Compile Include="Entitys\MES\MES_WIP_HIS.cs" />
<Compile Include="Entitys\MES\MES_WO_ACTION.cs" />
<Compile Include="Entitys\MES\MES_WO_EDGE.cs" />
<Compile Include="Entitys\MES\MES_WO_NODE.cs" />
<Compile Include="Entitys\MES\MES_WO_NODE_ACT.cs" />
+ <Compile Include="Entitys\MES\MES_WO_NODE_DFTG.cs" />
+ <Compile Include="Entitys\MES\MES_WO_NODE_POST.cs" />
<Compile Include="Entitys\MES\MES_WO_OPER.cs" />
<Compile Include="Entitys\MES\node.cs" />
<Compile Include="Entitys\MES\ParameterEntity\SmtLoadingReturn.cs" />
<Compile Include="Entitys\MES\ParameterEntity\SmtLoadingInput.cs" />
+ <Compile Include="Entitys\MES\ParameterEntity\PositionParameter.cs" />
<Compile Include="Entitys\MES\ParameterEntity\U9C_MES_Input.cs" />
<Compile Include="Entitys\MES\R_Wip_Tracking_T.cs" />
<Compile Include="Entitys\MES\SMT_FEEDER.cs" />
--
Gitblit v1.9.3