From 87422530bec9baf531d2e0715b9c786a4d35667f Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 02 一月 2025 15:59:44 +0800
Subject: [PATCH] Add new properties and classes for process and code handling
---
Tiger.Business.MES/WorkAction/InputQty.cs | 1
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 1
Tiger.Model.Net/Entitys/BAS/BAS_CODE_MEANING.cs | 106 +++++++++++++++++++++++++++++++++++
Tiger.Business.MES/WorkAction/Assembly.cs | 1
Tiger.Business.MES/WorkAction/Weighing.cs | 1
Tiger.Model.Net/Tiger.Model.Net.csproj | 1
Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | 1
Tiger.Business.MES/WorkAction/PackageInputCheck.cs | 1
Tiger.Business.MES/WorkAction/IPQC.cs | 1
Tiger.Business.MES/WorkAction/YadaWoReport.cs | 1
Tiger.Model.Net/Entitys/BAS/BAS_CODE_RULE.cs | 10 +++
Tiger.Business.MES/WorkAction/YadaAssembly.cs | 1
Tiger.Business.MES/WorkAction/PackingAction.cs | 1
Tiger.Business.MES/WorkAction/PrintLabel.cs | 1
Tiger.Business.MES/WorkAction/VerifyCustomSN.cs | 1
Tiger.Business.MES/WorkAction/WipExtInfo.cs | 1
Tiger.Business.WMS/Common/Barcode/Barcode.cs | 1
17 files changed, 131 insertions(+), 0 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index 8062a19..f21cf84 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -397,6 +397,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index 5161043..b5b36dc 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -206,6 +206,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/InputQty.cs b/Tiger.Business.MES/WorkAction/InputQty.cs
index 3c4afd5..c860232 100644
--- a/Tiger.Business.MES/WorkAction/InputQty.cs
+++ b/Tiger.Business.MES/WorkAction/InputQty.cs
@@ -274,6 +274,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/PackageInputCheck.cs b/Tiger.Business.MES/WorkAction/PackageInputCheck.cs
index 7e6d42e..0e1f541 100644
--- a/Tiger.Business.MES/WorkAction/PackageInputCheck.cs
+++ b/Tiger.Business.MES/WorkAction/PackageInputCheck.cs
@@ -291,6 +291,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index b6aeb79..e4242d8 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -926,6 +926,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
index c802a37..ba74f6b 100644
--- a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
@@ -229,6 +229,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index c750361..a1dede3 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -207,6 +207,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index 53262cd..31b39e4 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -435,6 +435,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs b/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
index 9830dc2..cb872d9 100644
--- a/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
+++ b/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
@@ -225,6 +225,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/Weighing.cs b/Tiger.Business.MES/WorkAction/Weighing.cs
index 10dcc41..b137032 100644
--- a/Tiger.Business.MES/WorkAction/Weighing.cs
+++ b/Tiger.Business.MES/WorkAction/Weighing.cs
@@ -231,6 +231,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/WipExtInfo.cs b/Tiger.Business.MES/WorkAction/WipExtInfo.cs
index 588e0a5..4360065 100644
--- a/Tiger.Business.MES/WorkAction/WipExtInfo.cs
+++ b/Tiger.Business.MES/WorkAction/WipExtInfo.cs
@@ -253,6 +253,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/YadaAssembly.cs b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
index ed9f13c..ff7970d 100644
--- a/Tiger.Business.MES/WorkAction/YadaAssembly.cs
+++ b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
@@ -412,6 +412,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.MES/WorkAction/YadaWoReport.cs b/Tiger.Business.MES/WorkAction/YadaWoReport.cs
index 45acbe5..47bb961 100644
--- a/Tiger.Business.MES/WorkAction/YadaWoReport.cs
+++ b/Tiger.Business.MES/WorkAction/YadaWoReport.cs
@@ -209,6 +209,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
diff --git a/Tiger.Business.WMS/Common/Barcode/Barcode.cs b/Tiger.Business.WMS/Common/Barcode/Barcode.cs
index 0e3ccf4..385bb5a 100644
--- a/Tiger.Business.WMS/Common/Barcode/Barcode.cs
+++ b/Tiger.Business.WMS/Common/Barcode/Barcode.cs
@@ -182,6 +182,7 @@
/// </summary>
public bool IsQRCode => MetaSn.Contains(",");
+
public enum Types
{
/// <summary>
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_CODE_MEANING.cs b/Tiger.Model.Net/Entitys/BAS/BAS_CODE_MEANING.cs
new file mode 100644
index 0000000..4d33116
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_CODE_MEANING.cs
@@ -0,0 +1,106 @@
+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_CODE_MEANING")]
+ public class BAS_CODE_MEANING : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：条码含义
+ /// </summary>
+ public BAS_CODE_MEANING() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 条码含义编码
+ /// </summary>
+ [DisplayName("条码含义编码")]
+ public string MING_CODE { get; set; }
+ /// <summary>
+ /// 条码含义名称
+ /// </summary>
+ [DisplayName("条码含义名称")]
+ public string MING_NAME { get; set; }
+ /// <summary>
+ /// 条码含义描述
+ /// </summary>
+ [DisplayName("条码含义描述")]
+ public string MING_DESC { get; set; }
+ /// <summary>
+ /// 条码含义类型（0String字符|1Int整数|2Double小数|3DateTime日期）
+ /// </summary>
+ [DisplayName("条码含义类型（0String字符|1Int整数|2Double小数|3DateTime日期）")]
+ public int MING_TYPE { get; set; }
+ /// <summary>
+ /// 关联表
+ /// </summary>
+ [DisplayName("关联表")]
+ public string DB_TABLE { get; set; }
+ /// <summary>
+ /// 关联字段
+ /// </summary>
+ [DisplayName("关联字段")]
+ public string DB_FIELD { get; set; }
+ /// <summary>
+ /// 是否启用(Y/N)
+ /// </summary>
+ [DisplayName("是否启用(Y/N)")]
+ public string IS_ACTIVE { 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_CODE_MEANING类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_CODE_MEANINGId))]//ClassA表中的BAS_CODE_MEANINGId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_CODE_MEANINGId), 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/BAS/BAS_CODE_RULE.cs b/Tiger.Model.Net/Entitys/BAS/BAS_CODE_RULE.cs
index 155810a..7fd57f1 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_CODE_RULE.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_CODE_RULE.cs
@@ -44,6 +44,16 @@
/// </summary>
public int PRIORITY { get; set; }
/// <summary>
+ /// 鏄惁鍚敤(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鍚敤(Y/N)")]
+ public string IS_ACTIVE { get; set; }
+ /// <summary>
+ /// 鏉＄爜娈靛垎闅旂
+ /// </summary>
+ [DisplayName("鏉＄爜娈靛垎闅旂")]
+ public string SEPARATOR { get; set; }
+ /// <summary>
/// 鏉＄爜闀垮害
/// </summary>
public int CODE_LENGTH { get; set; }
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 70fbc37..7fd28cd 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -78,6 +78,7 @@
<Compile Include="Base\DbEntityBase.cs" />
<Compile Include="Base\TraceDebug.cs" />
<Compile Include="DTO\MESDTO.cs" />
+ <Compile Include="Entitys\BAS\BAS_CODE_MEANING.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" />
--
Gitblit v1.9.3