From 2728af674688a3d4d18ef498fde3ea808549f51b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 13:12:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 7 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
index 0538080..1e23b1a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
@@ -15,7 +15,8 @@
     /// 浠诲姟淇℃伅
     /// </summary>
     [SugarTable(nameof(Dt_SupplyTask), "鐩樼偣浠诲姟淇℃伅"), SugarIndex("unique_task_taskNum", nameof(TaskNum), OrderByType.Asc, true)]
-    public class Dt_SupplyTask : BaseEntity
+    public class Dt_SupplyTask : BaseEntity 
+
     {
         /// <summary>
         /// 涓婚敭
@@ -26,7 +27,7 @@
         public int TaskId { get; set; }
 
         /// <summary>
-        /// 浠诲姟鍙�
+        /// 浠诲姟鍙凤紱璁㈠崟璇︽儏涓婚敭锛欼D
         /// </summary>
         [ImporterHeader(Name = "浠诲姟鍙�")]
         [ExporterHeader(DisplayName = "浠诲姟鍙�")]
@@ -42,10 +43,58 @@
         public string PalletCode { get; set; }
 
         /// <summary>
+        /// 鎵规鍙�
+        /// </summary>
+        [ImporterHeader(Name = "鎵规鍙�")]
+        [ExporterHeader(DisplayName = "鎵规鍙�")]
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵规鍙�")]
+        public string BatchNo { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡缂栧彿
+        /// </summary>
+        [ImporterHeader(Name = "鐗╂枡缂栧彿")]
+        [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+        public string MaterielCode { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡鍚嶇О
+        /// </summary>
+        [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
+        [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡鍚嶇О")]
+        public string MaterielName { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡瑙勬牸
+        /// </summary>
+        [ImporterHeader(Name = "鐗╂枡瑙勬牸")]
+        [ExporterHeader(DisplayName = "鐗╂枡瑙勬牸")]
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡瑙勬牸")]
+        public string MaterielSpec { get; set; }
+
+        /// <summary>
+        /// 浠诲姟绫诲瀷
+        /// </summary>
+        [ImporterHeader(Name = "浠诲姟绫诲瀷")]
+        [ExporterHeader(DisplayName = "浠诲姟绫诲瀷")]
+        [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟绫诲瀷")]
+        public int TaskType { get; set; }
+
+        /// <summary>
+        /// 浠诲姟鐘舵��
+        /// </summary>
+        [ImporterHeader(Name = "浠诲姟鐘舵��")]
+        [ExporterHeader(DisplayName = "浠诲姟鐘舵��")]
+        [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鐘舵��")]
+        public int TaskStatus { get; set; }
+
+        /// <summary>
         /// 搴撴埧缂栧彿
         /// </summary>
-        [SugarColumn(IsNullable = false, ColumnDescription = "搴撴埧缂栧彿")]
-        public int WarehouseId { get; set; }
+        [SugarColumn(IsNullable = false, Length = 30, ColumnDescription = "搴撴埧缂栧彿")]
+        public string WarehouseCode { get; set; }
 
         /// <summary>
         /// 璐т綅缂栧彿,绔嬪簱鐩樼偣浠诲姟鐨勮揣浣嶇紪鍙峰氨绛変簬绔嬪簱
@@ -56,12 +105,12 @@
         public string LocationCode { get; set; }
 
         /// <summary>
-        /// 搴撳瓨鏁�
+        /// 搴撳瓨鏁�,浠诲姟鏁伴噺
         /// </summary>
         [ImporterHeader(Name = "搴撳瓨鏁�")]
         [ExporterHeader(DisplayName = "搴撳瓨鏁�")]
         [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏁�")]
-        public float StockQuantity { get; set; }
+        public decimal StockQuantity { get; set; }
 
         /// <summary>
         /// 鐩樼偣鏁帮紱鐩樼偣鍚庡疄闄呮暟閲�
@@ -69,7 +118,7 @@
         [ImporterHeader(Name = "鐩樼偣鏁�")]
         [ExporterHeader(DisplayName = "鐩樼偣鏁�")]
         [SugarColumn(IsNullable = false, ColumnDescription = "鐩樼偣鏁�", DefaultValue = "0")]
-        public float SupplyQuantity { get; set; }
+        public decimal SupplyQuantity { get; set; }
 
         /// <summary>
         /// 鍗曟嵁缂栧彿

--
Gitblit v1.9.3