From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc

---
 Wms/Model/ModelDto/DataDto/StockDetailDto.cs |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index b022414..7707123 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -44,22 +44,22 @@
         /// <summary>
         /// 鏁伴噺
         /// </summary>           
-        public int? Qty { get; set; }
+        public decimal? Qty { get; set; }
 
         /// <summary>
         /// 閿佸畾鏁伴噺
         /// </summary>           
-        public int? LockQty { get; set; }
+        public decimal? LockQty { get; set; }
 
         /// <summary>
         /// 鍐荤粨鏁伴噺
         /// </summary>           
-        public int? FrozenQty { get; set; }
+        public decimal? FrozenQty { get; set; }
 
         /// <summary>
         /// 鍙娊妫�鏁伴噺
         /// </summary>           
-        public int? InspectQty { get; set; }
+        public decimal? InspectQty { get; set; }
 
         /// <summary>
         /// 鍏ュ簱鍗曞彿
@@ -69,7 +69,7 @@
         /// <summary>
         /// 鍏ュ簱鏄庣粏鍙�
         /// </summary>           
-        public int ASNDetailNo { get; set; }
+        public int? ASNDetailNo { get; set; }
 
         /// <summary>
         /// 鎵�灞炰粨搴�
@@ -164,5 +164,45 @@
         /// 鏄惁鎵撳甫
         /// </summary>           
         public string IsBelt { get; set; }
+
+        /// <summary>
+        /// Desc:璐т富缂栧彿
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string OwnerNo { get; set; }
+
+        /// <summary>
+        /// Desc:璐т富鍚嶇О
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string OwnerName { get; set; }
+
+        /// <summary>
+        /// Desc:渚涘簲鍟嗙紪鍙�
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string SupplierNo { get; set; }
+
+        /// <summary>
+        /// Desc:渚涘簲鍟嗗悕绉�
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// Desc:澶囨敞
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string Demo { get; set; }
+
+        /// <summary>
+        /// 鍌ㄤ綅娣卞害
+        /// </summary>
+        public int Dept { get; set; }
     }
 }

--
Gitblit v1.8.0