From dedf678c1eaf3d63e5babddcb8dfb3f44e2e2fb9 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 15 六月 2024 14:01:17 +0800
Subject: [PATCH] 行为实体修改
---
Tiger.Model.Net/Tiger.Model.Net.csproj | 1
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs | 13 ++-
Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs | 168 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 178 insertions(+), 4 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs
new file mode 100644
index 0000000..94453e0
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs
@@ -0,0 +1,168 @@
+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_CUSTOM_ACT")]
+ public class MES_CUSTOM_ACT : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：工序行为定义
+ /// </summary>
+ public MES_CUSTOM_ACT() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 行为编码
+ /// </summary>
+ [DisplayName("行为编码")]
+ public string ACT_CODE { get; set; }
+ /// <summary>
+ /// 行为名称
+ /// </summary>
+ [DisplayName("行为名称")]
+ public string ACT_NAME { get; set; }
+ /// <summary>
+ /// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
+ /// </summary>
+ [DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)")]
+ public int ACT_TYPE { get; set; }
+ /// <summary>
+ /// 是否启用(Y/N)
+ /// </summary>
+ [DisplayName("是否启用(Y/N)")]
+ public string IS_ACTIVE { get; set; }
+ /// <summary>
+ /// 自定义方法类型(0ServerMethod服务端方法|1WebApiWebApi方法|2StoredProcedure存储过程)
+ /// </summary>
+ [DisplayName("自定义方法类型(0ServerMethod服务端方法|1WebApiWebApi方法|2StoredProcedure存储过程)")]
+ public int DO_TYPE { get; set; }
+ /// <summary>
+ /// 自定义方法(调用方法的全名)
+ /// </summary>
+ [DisplayName("自定义方法(调用方法的全名)")]
+ public string DO_METHOD { get; set; }
+ /// <summary>
+ /// 通过时执行(调用方法的全名)
+ /// </summary>
+ [DisplayName("通过时执行(调用方法的全名)")]
+ public string DO_IF_PASS { get; set; }
+ /// <summary>
+ /// 失败时执行(调用方法的全名)
+ /// </summary>
+ [DisplayName("失败时执行(调用方法的全名)")]
+ public string DO_IF_FAIL { get; set; }
+ /// <summary>
+ /// 设置值1
+ /// </summary>
+ [DisplayName("设置值1")]
+ public string OPTION_1 { get; set; }
+ /// <summary>
+ /// 设置值2
+ /// </summary>
+ [DisplayName("设置值2")]
+ public string OPTION_2 { get; set; }
+ /// <summary>
+ /// 设置值3
+ /// </summary>
+ [DisplayName("设置值3")]
+ public string OPTION_3 { get; set; }
+ /// <summary>
+ /// 设置值4
+ /// </summary>
+ [DisplayName("设置值4")]
+ public string OPTION_4 { get; set; }
+ /// <summary>
+ /// 设置值5
+ /// </summary>
+ [DisplayName("设置值5")]
+ public string OPTION_5 { 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_CUSTOM_ACT类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_CUSTOM_ACTId))]//ClassA表中的MES_CUSTOM_ACTId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_CUSTOM_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+
+ /// <summary>
+ /// 枚举：行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
+ /// </summary>
+ public enum ACT_TYPEs
+ {
+ [Description("默认行为")]
+ Normal = 0,
+ [Description("扫码验证")]
+ Scan = 1,
+ [Description("组装上料")]
+ Assy = 2,
+ [Description("产品测试")]
+ Test = 3,
+ [Description("产品抽检")]
+ Audit = 4,
+ [Description("标签打印")]
+ Print = 5,
+ }
+
+ /// <summary>
+ /// 枚举：自定义方法类型(0ServerMethod服务端方法|1WebApiWebApi方法|2StoredProcedure存储过程)
+ /// </summary>
+ public enum DO_TYPEs
+ {
+ [Description("服务端方法")]
+ ServerMethod = 0,
+ [Description("方法")]
+ WebApiWebApi = 1,
+ [Description("存储过程")]
+ StoredProcedure = 2,
+ }
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
index 961b9c2..fa5b014 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
@@ -42,10 +42,15 @@
/// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃)
/// </summary>
public int ACT_TYPE { get; set; }
- /// <summary>
- /// 缁樺浘灞炴�э細type
- /// </summary>
- public string GPH_TYPE { get; set; }
+ /// <summary>
+ /// 琛屼负缂栫爜
+ /// </summary>
+ [DisplayName("琛屼负缂栫爜")]
+ public string ACT_CODE { get; set; }
+ /// <summary>
+ /// 缁樺浘灞炴�э細type
+ /// </summary>
+ public string GPH_TYPE { get; set; }
/// <summary>
/// 缁樺浘灞炴�э細x
/// </summary>
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 3fe8100..fa2dbff 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -106,6 +106,7 @@
<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_CUSTOM_ACT.cs" />
<Compile Include="Entitys\MES\MES_PROD_NODE_ACT.cs" />
<Compile Include="Entitys\MES\MES_ROUTE_NODE_ACT.cs" />
<Compile Include="Entitys\MES\MES_ROUTE_NODE_DFTG.cs" />
--
Gitblit v1.9.3