From 43b2af8956d54dc3a53f211c53d8af582806b6ba Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 08 四月 2025 11:18:58 +0800
Subject: [PATCH] 备料任务合并发料只适用于包装车间工单发料 备料任务增加根据发料类型,调用相应发料单据的ERP接口

---
 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MOPickList.cs |  187 ++++++++++++++++++++++++++--------------------
 1 files changed, 106 insertions(+), 81 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MOPickList.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MOPickList.cs
index 236d8b1..a3de1b1 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MOPickList.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MOPickList.cs
@@ -4,164 +4,189 @@
 using System.ComponentModel;
 using System.Collections.Generic;
 using Tiger.Model;
+using Tiger.Model.Base;
 
 namespace Tiger.Model.MES.Yada
 {
 	/// <summary>
-	/// 实体:mes_MOPickList
+	/// 瀹炰綋锛歮es_MOPickList
 	/// </summary>
 	[Serializable]
 	[SugarTable("mes_MOPickList")]
-	public class mes_MOPickList : iViewEntity
-	{
-		#region 构造函数
+	public class mes_MOPickList : iViewEntity, iPrepPickItem
+    {
+		#region 鏋勯�犲嚱鏁�
 		/// <summary>
-		/// 实体:mes_MOPickList
+		/// 瀹炰綋锛歮es_MOPickList
 		/// </summary>
 		public mes_MOPickList() {}
 		#endregion
 
-		#region 公共属性
+		#region 鍏叡灞炴��
 		/// <summary>
-		/// 
+		/// 宸ュ崟澶囨枡琛↖D
+		/// </summary>
+		public long PickListId { get; set; }
+		/// <summary>
+		/// 渚涘簲鍟嗙粍缁�
 		/// </summary>
 		public long SupplyOrg { get; set; }
 		/// <summary>
-		/// 
+		/// 琛屽彿
 		/// </summary>
 		public int DocLineNO { get; set; }
 		/// <summary>
-		/// 
+		/// 宸ュ崟ID
 		/// </summary>
 		public long MoId { get; set; }
 		/// <summary>
-		/// 
+		/// 宸ュ崟鍙�
 		/// </summary>
 		public string MoDocNo { get; set; }
 		/// <summary>
-		/// 
+		/// 鐗╂枡缂栫爜ID
 		/// </summary>
 		public long ItemMaster { get; set; }
 		/// <summary>
-		/// 
+		/// 鐗╂枡缂栫爜
 		/// </summary>
 		public string Code { get; set; }
 		/// <summary>
-		/// 
+		/// 瀹為檯闇�姹傛暟閲�
 		/// </summary>
-		public decimal ActualReqQty { get; set; }
+		public double ActualReqQty { get; set; }
 		/// <summary>
-		/// 
+		/// 瀹炲彂鏁伴噺
 		/// </summary>
-		public decimal IssuedQty { get; set; }
+		public double IssuedQty { get; set; }
 		/// <summary>
-		/// 
+		/// 鏈彂鏁伴噺
 		/// </summary>
-		public decimal IssueNotDeliverQty { get; set; }
+		public double IssueNotDeliverQty { get; set; }
 		/// <summary>
-		/// 
+		/// 鍙戞枡鏂瑰紡
 		/// </summary>
 		public int IssueStyle { get; set; }
 		/// <summary>
-		/// 
+		/// 鍙戞枡鏂瑰紡鍚嶇О
 		/// </summary>
 		public string IssueStyleName { get; set; }
 		/// <summary>
-		/// 
+		/// 鍗曚綅
+		/// </summary>
+		public string IssueUOM { get; set; }
+		/// <summary>
+		/// 浠撳簱ID
 		/// </summary>
 		public long WhId { get; set; }
 		/// <summary>
-		/// 
+		/// 浠撳簱浠g爜
 		/// </summary>
 		public string WhCode { get; set; }
 		/// <summary>
-		/// 
+		/// 浠撳簱鍚嶇О
 		/// </summary>
 		public string WhName { get; set; }
 		/// <summary>
-		/// 
+		/// 鍌ㄤ綅ID
 		/// </summary>
 		public long BinId { get; set; }
 		/// <summary>
-		/// 
+		/// 鍌ㄤ綅浠g爜
 		/// </summary>
 		public string BinCode { get; set; }
 		/// <summary>
-		/// 
+		/// 鍌ㄤ綅鍚嶇О
 		/// </summary>
 		public string BinName { get; set; }
 		/// <summary>
-		/// 
+		/// 寤鸿鎵规
 		/// </summary>
 		public string SuggestedBatch { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string InventoryInfoCode { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string PictureCode { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Remark { get; set; }
-        /// <summary>
-        /// 销售订单备注
-        /// </summary>
-        public string SoRemark { get; set; }
-        /// <summary>
-        /// 生产订单备注
-        /// </summary>
-        public string MoRemark { get; set; }
-        /// <summary>
-        /// 产品型号
-        /// </summary>
-        public string ItemModel { get; set; }
-        /// <summary>
-        /// Sap料
-        /// </summary>
-        public string SapCode { get; set; }
-        /// <summary>
-        /// 客户
-        /// </summary>
-        public string Customer { get; set; }
-        /// <summary>
-        /// 需求分类
-        /// </summary>
-        public string DemandCode { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public DateTime CreatedOn { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 
+		/// 鍒涘缓鏃堕棿
+		/// </summary>
+		public DateTime CreatedOn { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 鏇存柊鏃堕棿
 		/// </summary>
 		public DateTime ModifiedOn { get; set; } = DateTime.MinValue;
-		#endregion
+		/// <summary>
+		/// 搴撳瓨鍌ㄤ綅
+		/// </summary>
+		public string InventoryInfoCode { get; set; }
+		/// <summary>
+		/// 鍥剧爜
+		/// </summary>
+		public string PictureCode { get; set; }
+		/// <summary>
+		/// 澶囨敞
+		/// </summary>
+		public string Remark { get; set; }
+		/// <summary>
+		/// 閿�鍞鍗曞娉�
+		/// </summary>
+		public string SoRemark { get; set; }
+		/// <summary>
+		/// 宸ュ崟澶囨敞
+		/// </summary>
+		public string MoRemark { get; set; }
+		/// <summary>
+		/// 浜у搧鍨嬪彿
+		/// </summary>
+		public string ItemModel { get; set; }
+		/// <summary>
+		/// SAP鏂欏彿
+		/// </summary>
+		public string SapCode { get; set; }
+		/// <summary>
+		/// 瀹㈡埛鍚嶇О
+		/// </summary>
+		public string Customer { get; set; }
+		/// <summary>
+		/// 闇�姹傚垎绫�
+		/// </summary>
+		public string DemandCode { get; set; }
 
-		#region 虚拟属性
-		/*例子
+        #endregion
+
+        #region 铏氭嫙灞炴��
+        /*渚嬪瓙
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
 		*/
-		#endregion
+        #endregion
 
-		#region 枚举变量
-		/*例子
+        #region 鏋氫妇鍙橀噺
+        /*渚嬪瓙
 		public enum FieldNames
 		{
-			[Description("枚举描述0")]
+			[Description("鏋氫妇鎻忚堪0")]
 			Enum0,
-			[Description("枚举描述1")]
+			[Description("鏋氫妇鎻忚堪1")]
 			Enum1,
 		}
 		*/
-		#endregion
+        #endregion
 
-		#region 公共方法
+        #region 鍏叡鏂规硶
+        public BIZ_WMS_PREP_SRC_DTL GetPickItem()
+        {
+            return new BIZ_WMS_PREP_SRC_DTL()
+            {
+                Source = this,
+                ITEM_CODE = Code,
+                UNIT = IssueUOM,
+                SOURCE_CODE = nameof(BIZ_MES_WO),
+                SOURCE_ID = PickListId.ToString(),
+                SOURCE_ORDER = MoDocNo,
+                SOURCE_LINE = DocLineNO.ToString(),
+                QTY_REQ = ActualReqQty,
+                QTY_DLVY = IssuedQty,
+                QTY_ACT_REQ = ActualReqQty - IssuedQty,
+            };
+        }
+        #endregion
 
-		#endregion
-
-	}//endClass
+    }//endClass
 }
\ No newline at end of file

--
Gitblit v1.9.3