From 2c188371ed9e91ba58c452dbf27150de8eca208a Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 15 七月 2024 10:52:14 +0800
Subject: [PATCH] 增加IWorkStep，行为要保存数据，对接工步DBSubmitAction
---
Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 157 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 42 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
index 02b6e66..346d982 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
@@ -10,6 +10,7 @@
/// 实体：工单
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("工单")]
[Serializable]
[SugarTable("BIZ_MES_WO")]
public class BIZ_MES_WO : DbEntityWithAuth
@@ -25,162 +26,204 @@
/// <summary>
/// 工单号
/// </summary>
+ [DisplayName("工单号")]
public string ORDER_NO { get; set; }
/// <summary>
- /// 工单类型(0Normal正常|1Rework返工)
+ /// 工单类型(0Plan计划|1Standard标准|2Rework返工|3Restructuring在库改制|5Outsourcing委外|6RD研发|7Forecast预测|8Disassemble拆卸)
/// </summary>
- public string ORDER_TYPE { get; set; }
+ [DisplayName("工单类型(0Plan计划|1Standard标准|2Rework返工|3Restructuring在库改制|5Outsourcing委外|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>
- public int STD_WORKERS_QTY { get; set; }
+ [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
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
+ #region 外键属性
+ /*例子
//一对一外键导航
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_MES_WO类里面的外键ID字段
public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
@@ -191,10 +234,10 @@
[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")]
@@ -203,38 +246,68 @@
Enum1,
}
*/
- public enum STATUSs
- {
- [Description("初始化")]
- Init,
- [Description("已导入")]
- Imported,
- [Description("已下发")]
- Release,
- [Description("生产中")]
- Working,
- [Description("已暂停")]
- Paused,
- [Description("已关闭")]
- Closed,
- }
- public enum ROUTE_STATUSs
- {
- [Description("待配置")]
- WaitSet,
- [Description("已配置")]
- Finish,
- [Description("取消")]
- Cancel,
- [Description("已关闭")]
- Closed,
- }
- #endregion
+ /// <summary>
+ /// 枚举：工单类型(0Plan计划|1Standard标准|2Rework返工|3Restructuring在库改制|5Outsourcing委外|6RD研发|7Forecast预测|8Disassemble拆卸)
+ /// </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,
+ }
- #region 公共方法
+ /// <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,
+ }
- #endregion
+ /// <summary>
+ /// 枚举：工艺状态(0WaitSet待配置|1Finish已配置|2Cancel取消|3Close关闭)
+ /// </summary>
+ public enum ROUTE_STATUSs
+ {
+ [Description("待配置")]
+ WaitSet = 0,
+ [Description("已配置")]
+ Finish = 1,
+ [Description("取消")]
+ Cancel = 2,
+ [Description("关闭")]
+ Close = 3,
+ }
+ #endregion
- }//endClass
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3