From a8756c3526832332db4ef5685348d9b188c2bf2b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:36:44 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
index 79a89f5..ce73ad8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
@@ -105,6 +105,18 @@
         public string MaterielCode { get; set; }
 
         /// <summary>
+        /// 鐗╂枡鍚嶇О
+        /// </summary>
+        [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+        public string MaterielName { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡瑙勬牸
+        /// </summary>
+        [ExporterHeader(DisplayName = "鐗╂枡瑙勬牸")]
+        public string MaterielSpec { get; set; }
+
+        /// <summary>
         /// 鐗╂枡鎵瑰彿
         /// </summary>
         [ExporterHeader(DisplayName = "鐗╂枡鎵瑰彿")]
@@ -122,6 +134,12 @@
         public int StockStatus { get; set; }
 
         /// <summary>
+        /// 搴撳瓨瓒呮湡鏍囪瘑
+        /// </summary>
+        [ExporterHeader(IsIgnore = true)]
+        public int Expirationlabel { get; set; }
+
+        /// <summary>
         /// 搴撳瓨澶囨敞
         /// </summary>
         [ExporterHeader(IsIgnore = true)]

--
Gitblit v1.9.3