From 763ec431417b1300b57a77aba9e9a203c6e798e5 Mon Sep 17 00:00:00 2001
From: Cloud Zhang <941187371@qq.com>
Date: 星期四, 23 五月 2024 15:10:46 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

---
 Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs       |   85 ++++++++++
 Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs |   92 ++++++-----
 Tiger.Model.Net/Entitys/BAS/BAS_PKG_SN.cs        |   81 ++++++++++
 Tiger.Model.Net/Entitys/BAS/BAS_PKG_RULE.cs      |   81 ++++++++++
 Tiger.Model.Net/Tiger.Model.Net.csproj           |    4 
 Tiger.Model.Net/Entitys/BAS/BAS_PKG_TYPE.cs      |   81 ++++++++++
 6 files changed, 380 insertions(+), 44 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs
new file mode 100644
index 0000000..97ea1b9
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs
@@ -0,0 +1,85 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：包装数量明细
+	/// </summary>
+	[Description("Primary:ID")]
+	[Serializable]
+	[SugarTable("BAS_PKG_DTL")]
+	public class BAS_PKG_DTL : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：包装数量明细
+		/// </summary>
+		public BAS_PKG_DTL() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 包装规则ID
+		/// </summary>
+		public string PKG_RULE_ID { get; set; }
+		/// <summary>
+		/// 包装/载具编码
+		/// </summary>
+		public string PKG_CODE { get; set; }
+		/// <summary>
+		/// 包装层级
+		/// </summary>
+		public int PKG_LEVEL { get; set; }
+		/// <summary>
+		/// 包装数量
+		/// </summary>
+		public int PKG_QTY { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_PKG_DTL类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PKG_DTLId))]//ClassA表中的BAS_PKG_DTLId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PKG_DTLId), 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_PKG_RULE.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_RULE.cs
new file mode 100644
index 0000000..97958f5
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_RULE.cs
@@ -0,0 +1,81 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：包装规则定义
+	/// </summary>
+	[Description("Primary:ID")]
+	[Serializable]
+	[SugarTable("BAS_PKG_RULE")]
+	public class BAS_PKG_RULE : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：包装规则定义
+		/// </summary>
+		public BAS_PKG_RULE() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 包装规则编码
+		/// </summary>
+		public string RULE_CODE { get; set; }
+		/// <summary>
+		/// 包装规则名称
+		/// </summary>
+		public string RULE_NAME { get; set; }
+		/// <summary>
+		/// 是否启用(Y/N)
+		/// </summary>
+		public string IS_ACTIVE { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_PKG_RULE类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PKG_RULEId))]//ClassA表中的BAS_PKG_RULEId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PKG_RULEId), 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_PKG_SN.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_SN.cs
new file mode 100644
index 0000000..0982ccf
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_SN.cs
@@ -0,0 +1,81 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：包装载具条码
+	/// </summary>
+	[Description("Primary:ID")]
+	[Serializable]
+	[SugarTable("BAS_PKG_SN")]
+	public class BAS_PKG_SN : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：包装载具条码
+		/// </summary>
+		public BAS_PKG_SN() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 包装/载具条码
+		/// </summary>
+		public string PKG_SN { get; set; }
+		/// <summary>
+		/// 包装/载具编码
+		/// </summary>
+		public string PKG_CODE { get; set; }
+		/// <summary>
+		/// 状态(0InUsed使用中|1UnUsed闲置)
+		/// </summary>
+		public string STATUS { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_PKG_SN类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PKG_SNId))]//ClassA表中的BAS_PKG_SNId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PKG_SNId), 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_PKG_TYPE.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_TYPE.cs
new file mode 100644
index 0000000..e99534f
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_TYPE.cs
@@ -0,0 +1,81 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：包装载具类型
+	/// </summary>
+	[Description("Primary:ID")]
+	[Serializable]
+	[SugarTable("BAS_PKG_TYPE")]
+	public class BAS_PKG_TYPE : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：包装载具类型
+		/// </summary>
+		public BAS_PKG_TYPE() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 包装/载具编码
+		/// </summary>
+		public string PKG_CODE { get; set; }
+		/// <summary>
+		/// 包装/载具名称
+		/// </summary>
+		public string PKG_NAME { get; set; }
+		/// <summary>
+		/// 是否最小包装(Y/N)
+		/// </summary>
+		public string IS_MIN_PKG { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_PKG_TYPE类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PKG_TYPEId))]//ClassA表中的BAS_PKG_TYPEId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PKG_TYPEId), 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_PROD_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
index c447a0e..6324b32 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
@@ -7,121 +7,125 @@
 namespace Tiger.Model
 {
 	/// <summary>
-	/// 实体：产品工序行为
+	/// 瀹炰綋锛氫骇鍝佸伐搴忚涓�
 	/// </summary>
 	[Description("Primary:ID")]
 	[Serializable]
 	[SugarTable("MES_PROD_NODE_ACT")]
 	public class MES_PROD_NODE_ACT : DbEntityWithAuth
 	{
-		#region 构造函数
+		#region 鏋勯�犲嚱鏁�
 		/// <summary>
-		/// 实体：产品工序行为
+		/// 瀹炰綋锛氫骇鍝佸伐搴忚涓�
 		/// </summary>
 		public MES_PROD_NODE_ACT() {}
 		#endregion
 
-		#region 公共属性
+		#region 鍏叡灞炴��
 		/// <summary>
-		/// 产品编码
+		/// 浜у搧缂栫爜
 		/// </summary>
 		public string PROD_CODE { get; set; }
 		/// <summary>
-		/// 工序行为ID
+		/// 宸ュ簭琛屼负ID
 		/// </summary>
 		public string ACT_ID { get; set; }
 		/// <summary>
-		/// 工艺路线ID
+		/// 宸ヨ壓璺嚎ID
 		/// </summary>
 		public string ROT_ID { get; set; }
 		/// <summary>
-		/// 工序节点ID
+		/// 宸ュ簭鑺傜偣ID
 		/// </summary>
 		public string NODE_ID { get; set; }
+        /// <summary>
+        /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)
+        /// </summary>
+        public int ACT_TYPE { get; set; }
 		/// <summary>
-		/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
-		/// </summary>
-		public int ACT_TYPE { get; set; }
-		/// <summary>
-		/// 扫码验证：条码规则
+		/// 鎵爜楠岃瘉锛氭潯鐮佽鍒�
 		/// </summary>
 		public string RULE_CODE { get; set; }
 		/// <summary>
-		/// 组装上料：物料料号
+		/// 缁勮涓婃枡锛氱墿鏂欐枡鍙�
 		/// </summary>
 		public string ITEM_CODE { get; set; }
 		/// <summary>
-		/// 产品测试：检验项目编码
+		/// 浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�
 		/// </summary>
 		public string TEST_CODE { get; set; }
 		/// <summary>
-		/// 产品抽检：抽样规则编码
+		/// 浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�
 		/// </summary>
 		public string SAPL_CODE { get; set; }
 		/// <summary>
-		/// 标签打印：标签模板编码
+		/// 鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�
 		/// </summary>
 		public string LABEL_CODE { get; set; }
+        /// <summary>
+        /// 鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�
+        /// </summary>
+        public string PKG_CODE { get; set; }
+        /// <summary>
+        /// 璁剧疆鍊�1
+        /// </summary>
+        public string OPTION_1 { get; set; }
 		/// <summary>
-		/// 设置值1
-		/// </summary>
-		public string OPTION_1 { get; set; }
-		/// <summary>
-		/// 设置值2
+		/// 璁剧疆鍊�2
 		/// </summary>
 		public string OPTION_2 { get; set; }
 		/// <summary>
-		/// 设置值3
+		/// 璁剧疆鍊�3
 		/// </summary>
 		public string OPTION_3 { get; set; }
 		/// <summary>
-		/// 设置值4
+		/// 璁剧疆鍊�4
 		/// </summary>
 		public string OPTION_4 { get; set; }
 		/// <summary>
-		/// 设置值5
+		/// 璁剧疆鍊�5
 		/// </summary>
 		public string OPTION_5 { get; set; }
 		/// <summary>
-		/// 备注
+		/// 澶囨敞
 		/// </summary>
 		public string REMARK { get; set; }
 		#endregion
 
-		#region 虚拟属性
-		/*例子
+		#region 铏氭嫙灞炴��
+		/*渚嬪瓙
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
 		*/
 		#endregion
 
-		#region 外键属性
-		/*例子
-		//一对一外键导航
-		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_PROD_NODE_ACT类里面的外键ID字段
-		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
-		//一对多外键导航
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_NODE_ACTId))]//ClassA表中的MES_PROD_NODE_ACTId
-		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
-		//多对多外键导航
-		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_NODE_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
-		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		#region 澶栭敭灞炴��
+		/*渚嬪瓙
+		//涓�瀵逛竴澶栭敭瀵艰埅
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_PROD_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
+		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		//涓�瀵瑰澶栭敭瀵艰埅
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_NODE_ACTId))]//ClassA琛ㄤ腑鐨凪ES_PROD_NODE_ACTId
+		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		//澶氬澶氬閿鑸�
+		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_NODE_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		*/
 		#endregion
 
-		#region 枚举变量
-		/*例子
+		#region 鏋氫妇鍙橀噺
+		/*渚嬪瓙
 		public enum FieldNames
 		{
-			[Description("枚举描述0")]
+			[Description("鏋氫妇鎻忚堪0")]
 			Enum0,
-			[Description("枚举描述1")]
+			[Description("鏋氫妇鎻忚堪1")]
 			Enum1,
 		}
 		*/
 		#endregion
 
-		#region 公共方法
+		#region 鍏叡鏂规硶
 
 		#endregion
 
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 4caf9bb..c5a586f 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -79,6 +79,10 @@
     <Compile Include="Entitys\BAS\BAS_DEFECT_GRP.cs" />
     <Compile Include="Entitys\BAS\BAS_DFT_DUTY.cs" />
     <Compile Include="Entitys\BAS\BAS_DFT_LOC.cs" />
+    <Compile Include="Entitys\BAS\BAS_PKG_DTL.cs" />
+    <Compile Include="Entitys\BAS\BAS_PKG_RULE.cs" />
+    <Compile Include="Entitys\BAS\BAS_PKG_SN.cs" />
+    <Compile Include="Entitys\BAS\BAS_PKG_TYPE.cs" />
     <Compile Include="Entitys\BAS\BAS_REASON.cs" />
     <Compile Include="Entitys\BAS\BAS_REASON_GRP.cs" />
     <Compile Include="Entitys\BAS\BAS_SOLUTION.cs" />

--
Gitblit v1.9.3