From 9086b238cd9fbb9fbeae7cab11d59576cd9d2853 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 24 十一月 2025 10:27:01 +0800
Subject: [PATCH] 合并

---
 项目代码/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs"
index ad501fb..7f38ba1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs"
@@ -22,11 +22,17 @@
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
         public int Id { get; set; }
 
-        ///// <summary>
-        ///// 浠撳簱涓婚敭
-        ///// </summary>
-        //[SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
-        //public int WarehouseId { get; set; }
+        /// <summary>
+        /// 浠撳簱涓婚敭
+        /// </summary>
+        [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
+        public int WarehouseId { get; set; }
+
+        /// <summary>
+        /// 鍔犲伐涓績鍖哄煙
+        /// </summary>
+        [SugarColumn(IsNullable = false, ColumnDescription = "鍔犲伐涓績鍖哄煙")]
+        public int MakeArea { get; set; }
 
         /// <summary>
         /// 鍑哄簱鏉ユ簮鏄庣粏ID
@@ -102,9 +108,9 @@
         public DateTime EndDate { get; set; }
 
         /// <summary>
-        /// 鍒嗛厤闇�姹傛暟閲�
+        /// 宸插垎閰嶉渶姹傛暟閲�
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDescription = "鍒嗛厤闇�姹傛暟閲�")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶉渶姹傛暟閲�")]
         public decimal AssignTotalUsage { get; set; }
 
         /// <summary>
@@ -114,6 +120,18 @@
         public decimal OutTotalUsage { get; set; }
 
         /// <summary>
+        /// 鍩烘湰鍗曚綅
+        /// </summary>
+        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅")]
+        public string MaterielUnit { get; set; }
+
+        /// <summary>
+        /// 杈呭崟浣�
+        /// </summary>
+        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杈呭崟浣�")]
+        public string AssistUnitCode { get; set; }
+
+        /// <summary>
         /// 澶囨敞
         /// </summary>
         [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]

--
Gitblit v1.9.3