From f2fb67bf0cf463eb020599342f5e0476356821d8 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 02 一月 2025 14:58:29 +0800
Subject: [PATCH] Rename BAS_LABEL_PV to BAS_PROCESS_VAR

---
 Tiger.Business.MES/WorkAction/ThreeInOne.cs        |    4 
 Tiger.Model.Net/Entitys/BAS/BAS_PROCESS_VAR.cs     |  136 ++++++++++++++++++++++++++++++++++
 Tiger.Business.MES/Transaction/YadaPacking.cs      |    2 
 Tiger.Model.Net/Entitys/BAS/BAS_LABEL_PV.cs        |    8 +-
 Tiger.Model.Net/Tiger.Model.Net.csproj             |    1 
 Tiger.Business.MES/Transaction/Position.cs         |   20 ++--
 Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs |    4 
 Tiger.IBusiness.MES/Transaction/IPosition.cs       |    4 
 Tiger.Model.Net/Entitys/MES/MES_ROUTE_ACT_VAR.cs   |    5 +
 Tiger.Model.Net/Entitys/MES/MES_WO_ACT_VAR.cs      |    5 +
 Tiger.Business.MES/WorkAction/PackingAction.cs     |    6 
 Tiger.Business.MES/WorkAction/PrintLabel.cs        |    4 
 Tiger.Model.Net/Entitys/MES/MES_WIP_ACT_VAR.cs     |    5 +
 13 files changed, 178 insertions(+), 26 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index f4cf4b5..1cea2ce 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -570,12 +570,12 @@
         /// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
         /// <param name="label">鏍囩妯℃澘</param>
         /// <returns></returns>
-        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
+        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
         {
             return SetLabelVariables(labelPVs, label, action, null);
         }
 
-        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
+        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
         {
             foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
             {
@@ -608,14 +608,14 @@
         /// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
         /// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
         /// <returns></returns>
-        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
+        public string GetPrintProcessValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
         {
             var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
             if (!pv.IsNullOrEmpty())
             {
-                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
+                switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
                 {
-                    case BAS_LABEL_PV.VAR_TYPEs.ServerMethod:
+                    case BAS_PROCESS_VAR.VAR_TYPEs.ServerMethod:
                         {
                             switch (pv.VAR_METHOD)
                             {
@@ -759,9 +759,9 @@
                                     return "";
                             }
                         }
-                    case BAS_LABEL_PV.VAR_TYPEs.WebApi:
+                    case BAS_PROCESS_VAR.VAR_TYPEs.WebApi:
                         break;
-                    case BAS_LABEL_PV.VAR_TYPEs.StoredProcedure:
+                    case BAS_PROCESS_VAR.VAR_TYPEs.StoredProcedure:
                         break;
                     default:
                         break;
@@ -776,14 +776,14 @@
         /// <param name="labelPVs"></param>
         /// <param name="lv"></param>
         /// <returns></returns>
-        public string GetGeneratePValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
+        public string GetGeneratePValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv)
         {
             var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
             if (!pv.IsNullOrEmpty())
             {
-                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
+                switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
                 {
-                    case BAS_LABEL_PV.VAR_TYPEs.BarcodeGenerate:
+                    case BAS_PROCESS_VAR.VAR_TYPEs.BarcodeGenerate:
                         {
                             switch (pv.VAR_METHOD)
                             {
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 488cd68..eda33f4 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -944,7 +944,7 @@
             try
             {
                 var CurPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
-                var LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+                var LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
                 var label = CurPkg.Item.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == CurPkg.Item.LABEL_CODE).IncludesAllFirstLayer().First();
                 var printLb = SetLabelVariables(LabelPV, label, new PackingAction(), CurPkg);
                 action.Data = new PackingActionOutput()
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 25fd102..b6aeb79 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -32,7 +32,7 @@
         public PackingActionOutput CurCmd { get; set; }
         public int PrintTimes = 0;
         public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
-        public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
+        public List<BAS_PROCESS_VAR> LabelPV { get; set; } = new();
         public int FinishLevel = 0;
         private bool IsManually => CurStep.IsNullOrEmpty();
         #endregion Propertys & Variables
@@ -62,7 +62,7 @@
                 var label = code.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
                 LabelDic.Add(code.PKG_LEVEL, label);
             }
-            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
 
             //濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈変笖鏈寘瑁呭畬鎴愬垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
             if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
@@ -159,7 +159,7 @@
 
             //鏍规嵁琛屼负璁剧疆鑾峰彇澶氬眰鍖呰鐨勬爣绛炬墦鍗版ā鏉垮瓧鍏�
             LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;
-            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
             //鑾峰彇鍖呰瑙勫垯鐨勭О閲嶈寖鍥�
             PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
             //鎶�
diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
index 362cf3d..c802a37 100644
--- a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
@@ -25,7 +25,7 @@
         public MES_WO_ACTION Setting { get; set; }
         #endregion
         public BAS_LABEL_TEMP Label { get; set; }
-        public List<BAS_LABEL_PV> LabelPV { get; set; }
+        public List<BAS_PROCESS_VAR> LabelPV { get; set; }
         public WipPkg CurPkg { get; set; }
         public bool NoNeedInStorePrint { get; set; }
         #endregion Propertys & Variables
@@ -46,7 +46,7 @@
             #endregion
 
             Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
-            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
 
             CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
             CurStep.Status = StepStatus.Normal;
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index ff83bd4..c750361 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -24,7 +24,7 @@
         public MES_WO_ACTION Setting { get; set; }
         #endregion
         public BAS_LABEL_TEMP Label { get; set; }
-        public List<BAS_LABEL_PV> LabelPV { get; set; }
+        public List<BAS_PROCESS_VAR> LabelPV { get; set; }
         #endregion Propertys & Variables
 
         #region Functions
@@ -43,7 +43,7 @@
             #endregion
 
             Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
-            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
 
             CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
             CurStep.Status = StepStatus.Normal;
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index da6ad68..53262cd 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -27,7 +27,7 @@
         public MES_CUST_SN FlowCSN  { get; set; }
         public MES_CUST_SN CustCSN { get; set; }
         public BAS_LABEL_TEMP Label { get; set; }
-        public List<BAS_LABEL_PV> LabelPV { get; set; }
+        public List<BAS_PROCESS_VAR> LabelPV { get; set; }
         public List<mes_MOPickList> MoPickList { get; set; }
         public BAS_ITEM_CUST CustInfo { get; set; }
         #endregion Propertys & Variables
@@ -49,7 +49,7 @@
 
             //鑾峰彇鎵撳嵃妯℃澘
             Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
-            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
 
             //鑾峰彇褰撳墠浜у搧鍦ㄥ綋鍓嶅鎴风殑鍏崇郴
             CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();
diff --git a/Tiger.IBusiness.MES/Transaction/IPosition.cs b/Tiger.IBusiness.MES/Transaction/IPosition.cs
index 75bc542..966a648 100644
--- a/Tiger.IBusiness.MES/Transaction/IPosition.cs
+++ b/Tiger.IBusiness.MES/Transaction/IPosition.cs
@@ -66,14 +66,14 @@
         /// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
         /// <param name="label">鏍囩妯℃澘</param>
         /// <returns></returns>
-        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action);
+        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action);
         /// <summary>
         /// 鑾峰彇鎵撳嵃鏍囩妯℃澘杩囩▼鍙橀噺鍊�
         /// </summary>
         /// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
         /// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
         /// <returns></returns>
-        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg);
+        public string GetPrintProcessValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg);
         /// <summary>
         /// 鏍规嵁浼犲叆鐨勫寘瑁呭璞¤繑鍥炴墍鏈夌殑鍖呰瀹炰綋鍒楄〃
         /// </summary>
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_PV.cs b/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_PV.cs
index d4fc4fc..29026c9 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_PV.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_PV.cs
@@ -12,7 +12,7 @@
     [Description("Primary:ID")]
     [DisplayName("鏍囩杩囩▼鍙橀噺")]
     [Serializable]
-    [SugarTable("BAS_LABEL_PV")]
+    [SugarTable("BAS_PROCESS_VAR")]
     public class BAS_LABEL_PV : DbEntityWithAuth
     {
         #region 鏋勯�犲嚱鏁�
@@ -90,13 +90,13 @@
         #region 澶栭敭灞炴��
         /*渚嬪瓙
 		//涓�瀵逛竴澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊AS_LABEL_PV绫婚噷闈㈢殑澶栭敭ID瀛楁
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊AS_PROCESS_VAR绫婚噷闈㈢殑澶栭敭ID瀛楁
 		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		//涓�瀵瑰澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_LABEL_PVId))]//ClassA琛ㄤ腑鐨凚AS_LABEL_PVId
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PROCESS_VARId))]//ClassA琛ㄤ腑鐨凚AS_PROCESS_VARId
 		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		//澶氬澶氬閿鑸�
-		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_LABEL_PVId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PROCESS_VARId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
 		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		*/
         #endregion
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_PROCESS_VAR.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PROCESS_VAR.cs
new file mode 100644
index 0000000..60e95ec
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PROCESS_VAR.cs
@@ -0,0 +1,136 @@
+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("BAS_PROCESS_VAR")]
+	public class BAS_PROCESS_VAR : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体:系统过程变量
+		/// </summary>
+		public BAS_PROCESS_VAR() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 过程变量编码
+		/// </summary>
+		[DisplayName("过程变量编码")]
+		public string VAR_CODE { get; set; }
+		/// <summary>
+		/// 过程变量名称
+		/// </summary>
+		[DisplayName("过程变量名称")]
+		public string VAR_NAME { get; set; }
+		/// <summary>
+		/// 是否只读(Y/N)
+		/// </summary>
+		[DisplayName("是否只读(Y/N)")]
+		public string READONLY { get; set; }
+		/// <summary>
+		/// 自定义方法类型(0ServerMethod服务端方法|1BarcodeGenerate条码生成|2WebApiWebApi方法|3StoredProcedure存储过程)
+		/// </summary>
+		[DisplayName("自定义方法类型(0ServerMethod服务端方法|1BarcodeGenerate条码生成|2WebApiWebApi方法|3StoredProcedure存储过程)")]
+		public int VAR_TYPE { get; set; }
+		/// <summary>
+		/// 自定义方法(调用方法的全名)
+		/// </summary>
+		[DisplayName("自定义方法(调用方法的全名)")]
+		public string VAR_METHOD { get; set; }
+		/// <summary>
+		/// 备用值1
+		/// </summary>
+		[DisplayName("备用值1")]
+		public string VALUE_1 { get; set; }
+		/// <summary>
+		/// 备用值2
+		/// </summary>
+		[DisplayName("备用值2")]
+		public string VALUE_2 { get; set; }
+		/// <summary>
+		/// 备用值3
+		/// </summary>
+		[DisplayName("备用值3")]
+		public string VALUE_3 { get; set; }
+		/// <summary>
+		/// 备用值4
+		/// </summary>
+		[DisplayName("备用值4")]
+		public string VALUE_4 { get; set; }
+		/// <summary>
+		/// 备用值5
+		/// </summary>
+		[DisplayName("备用值5")]
+		public string VALUE_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是BAS_PROCESS_VAR类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PROCESS_VARId))]//ClassA表中的BAS_PROCESS_VARId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PROCESS_VARId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+
+		/// <summary>
+		/// 枚举:自定义方法类型(0ServerMethod服务端方法|1BarcodeGenerate条码生成|2WebApiWebApi方法|3StoredProcedure存储过程)
+		/// </summary>
+		public enum VAR_TYPEs
+		{
+			[Description("服务端方法")]
+			ServerMethod = 0,
+			[Description("条码生成")]
+			BarcodeGenerate = 1,
+			[Description("方法")]
+			WebApiWebApi = 2,
+			[Description("存储过程")]
+			StoredProcedure = 3,
+		}
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_ACT_VAR.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_ACT_VAR.cs
index 54a100e..59e4bec 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_ACT_VAR.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_ACT_VAR.cs
@@ -64,6 +64,11 @@
 		[DisplayName("是否显示(Y/N)")]
 		public string VISIABLE { get; set; }
 		/// <summary>
+		/// 系统过程变量编码
+		/// </summary>
+		[DisplayName("系统过程变量编码")]
+		public string PROCESS_VAR { get; set; }
+		/// <summary>
 		/// 默认值
 		/// </summary>
 		[DisplayName("默认值")]
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT_VAR.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT_VAR.cs
index 3bcdd5b..2e63031 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT_VAR.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT_VAR.cs
@@ -179,6 +179,11 @@
 		[DisplayName("变量值类型(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)")]
 		public int VALUE_TYPE { get; set; }
 		/// <summary>
+		/// 系统过程变量编码
+		/// </summary>
+		[DisplayName("系统过程变量编码")]
+		public string PROCESS_VAR { get; set; }
+		/// <summary>
 		/// 输入值
 		/// </summary>
 		[DisplayName("输入值")]
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WO_ACT_VAR.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_ACT_VAR.cs
index 76a746b..e575753 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_ACT_VAR.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_ACT_VAR.cs
@@ -74,6 +74,11 @@
 		[DisplayName("是否显示(Y/N)")]
 		public string VISIABLE { get; set; }
 		/// <summary>
+		/// 系统过程变量编码
+		/// </summary>
+		[DisplayName("系统过程变量编码")]
+		public string PROCESS_VAR { get; set; }
+		/// <summary>
 		/// 默认值
 		/// </summary>
 		[DisplayName("默认值")]
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 19f71ff..70fbc37 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Base\TraceDebug.cs" />
     <Compile Include="DTO\MESDTO.cs" />
     <Compile Include="Entitys\BAS\BAS_CODE_TYPE.cs" />
+    <Compile Include="Entitys\BAS\BAS_PROCESS_VAR.cs" />
     <Compile Include="Entitys\MES\MES_ROUTE_ACT_VAR.cs" />
     <Compile Include="Entitys\MES\MES_WIP_ACT_VAR.cs" />
     <Compile Include="Entitys\MES\MES_WO_ACT_VAR.cs" />

--
Gitblit v1.9.3