From e163a27328c805ffec7c894259430f76f0881d00 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 03 四月 2025 23:12:23 +0800
Subject: [PATCH] 更新收货单提交按行提交已完成清点的行,上架增加IQC审核的判断

---
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs |  150 +++++++++++++++++++++++++++++--------------------
 1 files changed, 89 insertions(+), 61 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs
index 0ccd778..c94f193 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs
@@ -7,148 +7,176 @@
 namespace Tiger.Model
 {
 	/// <summary>
-	/// 实体:收货单(U9)明细
+	/// 瀹炰綋锛氭敹璐у崟(U9)鏄庣粏
 	/// </summary>
 	[Description("Primary:ID")]
-	[DisplayName("收货单(U9)明细")]
+	[DisplayName("鏀惰揣鍗�(U9)鏄庣粏")]
 	[Serializable]
 	[SugarTable("BIZ_U9_RECEIPT_DTL")]
 	public class BIZ_U9_RECEIPT_DTL : DbEntityWithAuth
 	{
-		#region 构造函数
+		#region 鏋勯�犲嚱鏁�
 		/// <summary>
-		/// 实体:收货单(U9)明细
+		/// 瀹炰綋锛氭敹璐у崟(U9)鏄庣粏
 		/// </summary>
 		public BIZ_U9_RECEIPT_DTL() {}
 		#endregion
 
-		#region 公共属性
+		#region 鍏叡灞炴��
 		/// <summary>
-		/// 单据号
+		/// 鍗曟嵁鍙�
 		/// </summary>
-		[DisplayName("单据号")]
+		[DisplayName("鍗曟嵁鍙�")]
 		public string ORDER_NO { get; set; }
 		/// <summary>
-		/// 单据行号
+		/// 鍗曟嵁琛屽彿
 		/// </summary>
-		[DisplayName("单据行号")]
+		[DisplayName("鍗曟嵁琛屽彿")]
 		public string LINE_NO { get; set; }
 		/// <summary>
-		/// 状态(同单据状态)
+		/// 鐘舵��(鍚屽崟鎹姸鎬�)
 		/// </summary>
-		[DisplayName("状态(同单据状态)")]
+		[DisplayName("鐘舵��(鍚屽崟鎹姸鎬�)")]
 		public int STATUS { get; set; }
 		/// <summary>
-		/// 物料编码
+		/// 鐗╂枡缂栫爜
 		/// </summary>
-		[DisplayName("物料编码")]
+		[DisplayName("鐗╂枡缂栫爜")]
 		public string ITEM_CODE { get; set; }
 		/// <summary>
-		/// 单位
+		/// 鍗曚綅
 		/// </summary>
-		[DisplayName("单位")]
+		[DisplayName("鍗曚綅")]
 		public string UNIT { get; set; }
 		/// <summary>
-		/// 单据数量
+		/// 鍗曟嵁鏁伴噺
 		/// </summary>
-		[DisplayName("单据数量")]
+		[DisplayName("鍗曟嵁鏁伴噺")]
 		public double QTY { get; set; }
 		/// <summary>
-		/// 包装数量
+		/// 鍖呰鏁伴噺
 		/// </summary>
-		[DisplayName("包装数量")]
+		[DisplayName("鍖呰鏁伴噺")]
 		public double QTY_PACKING { get; set; }
 		/// <summary>
-		/// 入库数量
+		/// 鍏ュ簱鏁伴噺
 		/// </summary>
-		[DisplayName("入库数量")]
+		[DisplayName("鍏ュ簱鏁伴噺")]
 		public double QTY_IN { get; set; }
 		/// <summary>
-		/// 良品数量
+		/// 鑹搧鏁伴噺
 		/// </summary>
-		[DisplayName("良品数量")]
+		[DisplayName("鑹搧鏁伴噺")]
 		public double QTY_OK { get; set; }
 		/// <summary>
-		/// 不良数量
+		/// 涓嶈壇鏁伴噺
 		/// </summary>
-		[DisplayName("不良数量")]
+		[DisplayName("涓嶈壇鏁伴噺")]
 		public double QTY_NG { get; set; }
 		/// <summary>
-		/// 报废数量
+		/// 鎶ュ簾鏁伴噺
 		/// </summary>
-		[DisplayName("报废数量")]
+		[DisplayName("鎶ュ簾鏁伴噺")]
 		public double QTY_SCRAP { get; set; }
 		/// <summary>
-		/// 批次号
+		/// 璧犲搧鏁伴噺
 		/// </summary>
-		[DisplayName("批次号")]
+		[DisplayName("璧犲搧鏁伴噺")]
+		public double QTY_GIFT { get; set; }
+		/// <summary>
+		/// 鎵规鍙�
+		/// </summary>
+		[DisplayName("鎵规鍙�")]
 		public string LOTNO { get; set; }
 		/// <summary>
-		/// 送货单ID
+		/// ERP鍗曟嵁鐘舵��
 		/// </summary>
-		[DisplayName("送货单ID")]
+		[DisplayName("ERP鍗曟嵁鐘舵��")]
+		public string ERP_STATUS_CODE { get; set; }
+		/// <summary>
+		/// ERP鍗曟嵁鐘舵�佸悕绉�
+		/// </summary>
+		[DisplayName("ERP鍗曟嵁鐘舵�佸悕绉�")]
+		public string ERP_STATUS_NAME { get; set; }
+		/// <summary>
+		/// 閫佽揣鍗旾D
+		/// </summary>
+		[DisplayName("閫佽揣鍗旾D")]
 		public string ASN_ID { get; set; }
 		/// <summary>
-		/// 送货单号
+		/// 閫佽揣鍗曞彿
 		/// </summary>
-		[DisplayName("送货单号")]
+		[DisplayName("閫佽揣鍗曞彿")]
 		public string ASN_NO { get; set; }
 		/// <summary>
-		/// 送货单行ID
+		/// 閫佽揣鍗曡ID
 		/// </summary>
-		[DisplayName("送货单行ID")]
+		[DisplayName("閫佽揣鍗曡ID")]
 		public string ASN_LINE_ID { get; set; }
 		/// <summary>
-		/// 送货单行号
+		/// 閫佽揣鍗曡鍙�
 		/// </summary>
-		[DisplayName("送货单行号")]
+		[DisplayName("閫佽揣鍗曡鍙�")]
 		public string ASN_LINE { get; set; }
 		/// <summary>
-		/// 送检单号
+		/// 閫佹鍗曞彿
 		/// </summary>
-		[DisplayName("送检单号")]
+		[DisplayName("閫佹鍗曞彿")]
 		public string IQC_ORDER { get; set; }
 		/// <summary>
-		/// 备注
+		/// ERP缂栫爜
 		/// </summary>
-		[DisplayName("备注")]
+		[DisplayName("ERP缂栫爜")]
+		public string ERP_CODE { get; set; }
+		/// <summary>
+		/// 澶囨敞
+		/// </summary>
+		[DisplayName("澶囨敞")]
 		public string REMARK { get; set; }
 		#endregion
 
-		#region 虚拟属性
-		/*例子
+		#region 铏氭嫙灞炴��
+		/*渚嬪瓙
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
 		*/
-		#endregion
+        [SugarColumn(IsIgnore = true)]
+        public string ITEM_NAME => ItemInfo?.ITEM_NAME;
+        [SugarColumn(IsIgnore = true)]
+        public string ITEM_DESC => ItemInfo?.ITEM_DESC;
+        #endregion
 
-		#region 外键属性
-		/*例子
-		//一对一外键导航
-		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RECEIPT_DTL类里面的外键ID字段
-		public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null
-		//一对多外键导航
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RECEIPT_DTLId))]//ClassA表中的BIZ_U9_RECEIPT_DTLId
-		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null
-		//多对多外键导航
-		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RECEIPT_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
-		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null
+		#region 澶栭敭灞炴��
+		/*渚嬪瓙
+		//涓�瀵逛竴澶栭敭瀵艰埅
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RECEIPT_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁
+		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		//涓�瀵瑰澶栭敭瀵艰埅
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RECEIPT_DTLId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RECEIPT_DTLId
+		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		//澶氬澶氬閿鑸�
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RECEIPT_DTLId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		*/
-		#endregion
+        [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+        public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        [SugarColumn(IsIgnore = true)]
+        public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG);
+        #endregion
 
-		#region 枚举变量
-		/*例子
+		#region 鏋氫妇鍙橀噺
+		/*渚嬪瓙
 		public enum FieldNames
 		{
-			[Description("枚举描述0")]
+			[Description("鏋氫妇鎻忚堪0")]
 			Enum0,
-			[Description("枚举描述1")]
+			[Description("鏋氫妇鎻忚堪1")]
 			Enum1,
 		}
 		*/
 		#endregion
 
-		#region 公共方法
+		#region 鍏叡鏂规硶
 
 		#endregion
 

--
Gitblit v1.9.3