From ac8813cde64f7bf9882657416a1d102191aae960 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期六, 19 七月 2025 17:32:59 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 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 479b9d3..c7ea203 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"
@@ -11,123 +11,162 @@
 namespace WIDESEA_DTO.Stock
 {
     /// <summary>
-    /// 
+    /// 搴撳瓨瑙嗗浘
     /// </summary>
     public class StockViewDTO
     {
         /// <summary>
+        /// 浠撳簱ID
+        /// </summary>
+        [ExporterHeader(DisplayName = "浠撳簱ID")]
+        public int WarehouseId {  get; set; }
+        /// <summary>
         /// 璐т綅缂栧彿
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
         public string LocationCode { get; set; }
 
         /// <summary>
         /// 璐т綅鍚嶇О
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅鍚嶇О")]
         public string LocationName { get; set; }
 
         /// <summary>
         /// 璐т綅鍒�
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅鍒�")]
         public int Column { get; set; }
 
         /// <summary>
         /// 璐т綅琛�
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅琛�")]
         public int Row { get; set; }
 
         /// <summary>
         /// 璐т綅灞�
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅灞�")]
         public int Layer { get; set; }
-
-        /// <summary>
-        /// 搴撳尯涓婚敭
-        /// </summary>
-        public int WarehouseId {  get; set; }
 
         /// <summary>
         /// 璐т綅娣卞害
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅娣卞害")]
         public int Depth { get; set; }
 
         /// <summary>
         /// 璐т綅鐘舵��
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅鐘舵��")]
         public int LocationStatus { get; set; }
 
         /// <summary>
         /// 璐т綅绫诲瀷
         /// </summary>
+        [ExporterHeader(DisplayName = "璐т綅绫诲瀷")]
         public int LocationType { get; set; }
 
         /// <summary>
         /// 宸烽亾缂栧彿
         /// </summary>
+        [ExporterHeader(DisplayName = "宸烽亾缂栧彿")]
         public string RoadwayNo { get; set; }
 
         /// <summary>
         /// 绂佺敤鐘舵��
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         public int EnalbeStatus { get; set; }
 
         /// <summary>
         /// 搴撳瓨涓婚敭
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         public int StockId { get; set; }
 
         /// <summary>
         /// 鎵樼洏鍙�
         /// </summary>
+        [ExporterHeader(DisplayName = "鎵樼洏鍙�")]
         public string PalletCode { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         public bool IsFull { get; set; }
 
         /// <summary>
         /// 鐗╂枡缂栫爜
         /// </summary>
+        [ExporterHeader(DisplayName = "鐗╂枡缂栫爜")]
         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 = "鐗╂枡鎵瑰彿")]
         public string BatchNo { get; set; }
+        /// <summary>
+        /// 搴撳瓨鏁伴噺
+        /// </summary>
+        [ExporterHeader(DisplayName = "搴撳瓨鏁伴噺")]
+        public string StockCounts { get; set; }
 
         /// <summary>
         /// 搴撳瓨鐘舵��
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         public int StockStatus { get; set; }
 
         /// <summary>
         /// 搴撳瓨澶囨敞
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         public string StockRemark { get; set; }
 
         /// <summary>
         /// 鍒涘缓浜�
         /// </summary>
+        [ExporterHeader(DisplayName = "鍒涘缓浜�")]
         public string Creater { get; set; }
 
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
+        [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
         public DateTime CreateDate { get; set; }
 
         /// <summary>
         /// 淇敼浜�
         /// </summary>
+        [ExporterHeader(DisplayName = "淇敼浜�")]
         public string Modifier { get; set; }
 
         /// <summary>
         /// 淇敼鏃堕棿
         /// </summary>
+        [ExporterHeader(DisplayName = "淇敼鏃堕棿")]
         public DateTime? ModifyDate { get; set; }
 
         /// <summary>
         /// 搴撳瓨璇︽儏
         /// </summary>
+        [ExporterHeader(IsIgnore = true)]
         [Navigate(NavigateType.OneToMany, nameof(Dt_StockInfoDetail.StockId), nameof(StockId))]
         public List<Dt_StockInfoDetail> Details { get; set; }
     }

--
Gitblit v1.9.3