From 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 17 七月 2024 15:35:07 +0800
Subject: [PATCH] Merge branch 'master' into csc

---
 Wms/Model/ModelVm/DataVm/DataStockInfoVM.cs |  286 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 160 insertions(+), 126 deletions(-)

diff --git a/Wms/Model/ModelVm/DataVm/DataStockInfoVM.cs b/Wms/Model/ModelVm/DataVm/DataStockInfoVM.cs
index 9c35e38..e7fe8b2 100644
--- a/Wms/Model/ModelVm/DataVm/DataStockInfoVM.cs
+++ b/Wms/Model/ModelVm/DataVm/DataStockInfoVM.cs
@@ -9,6 +9,166 @@
         public int Id { get; set; }
 
         /// <summary>
+        /// Desc:鐗╂枡缂栫爜
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string SkuNo { get; set; }
+
+        /// <summary>
+        /// Desc:鐗╂枡鍚嶇О
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string SkuName { get; set; }
+
+        /// <summary>
+        /// Desc:瑙勬牸
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string Standard { get; set; }
+
+        /// <summary>
+        /// Desc:鍗曚綅
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// Desc:涓婃湀缁撳瓨-搴撳瓨鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal LastMonthQty { get; set; }
+        /// <summary>
+        /// Desc:涓婃湀缁撳瓨-搴撳瓨鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal LastMonthFoldedQty { get; set; }
+        
+        /// <summary>
+        /// Desc:鍏ュ簱鏁伴噺-褰撴棩鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal ArrDayQty { get; set; }
+        /// <summary>
+        /// Desc:鍏ュ簱鏁伴噺-褰撴棩鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal ArrDayFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:鍏ュ簱鏁伴噺-鏈湀鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal ArrMonthQty { get; set; }
+        /// <summary>
+        /// Desc:鍏ュ簱鏁伴噺-鏈湀鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal ArrMonthFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:鍏ュ簱鏁伴噺-鏈勾鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal ArrYearQty { get; set; }
+        /// <summary>
+        /// Desc:鍏ュ簱鏁伴噺-鏈勾鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal ArrYearFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:鍑哄簱鏁伴噺-褰撴棩鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SoDayQty { get; set; }
+        /// <summary>
+        /// Desc:鍑哄簱鏁伴噺-褰撴棩鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SoDayFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:鍑哄簱鏁伴噺-鏈湀鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SoMonthQty { get; set; }
+        /// <summary>
+        /// Desc:鍑哄簱鏁伴噺-鏈湀鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SoMonthFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:鍑哄簱鏁伴噺-鏈勾鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SoYearQty { get; set; }
+        /// <summary>
+        /// Desc:鍑哄簱鏁伴噺-鏈勾鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SoYearFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:褰撴湀缁撳瓨-绱鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal MonthQty { get; set; }
+        /// <summary>
+        /// Desc:褰撴湀缁撳瓨-绱鎶樹欢鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal MonthFoldedQty { get; set; }
+
+        /// <summary>
+        /// Desc:瀵勫瓨鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal DepositQty { get; set; }
+
+        /// <summary>
+        /// Desc:鏈湀搴撳瓨鏁伴噺
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// Desc:瀹夊叏搴撳瓨
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public decimal SecurityQty { get; set; }
+
+        /// <summary>
+        /// Desc:瀹夊叏搴撳瓨鎯呭喌
+        /// Default:
+        /// Nullable:True
+        /// </summary>   
+        public string Situation { get; set; }
+
+        /// <summary>
         /// 鍒涘缓鏃ユ湡
         /// </summary>
         public DateTime CreateTime { get; set; } = DateTime.Now;
@@ -32,131 +192,5 @@
         /// 鏇存柊浜�
         /// </summary>
         public int? UpdateUser { get; set; }
-        /// <summary>
-        /// Desc:鐗╂枡缂栫爜
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string SkuNo { get; set; }
-
-        /// <summary>
-        /// Desc:鐗╂枡鍚嶇О
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string SkuName { get; set; }
-
-        /// <summary>
-        /// Desc:瑙勬牸
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string Standard { get; set; }
-
-        /// <summary>
-        /// Desc:绫诲瀷
-        /// 0,4锛氬惃琚� 1锛氬叕鏂よ 2锛氱綈瑁呮弧妗� 3锛氱綈瑁呮《 5锛氭瘝鎵樼洏 6,7锛氬瓙鎵樼洏
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Desc:鍏ュ簱鏁伴噺
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal ArrivalQty { get; set; }
-
-        /// <summary>
-        /// Desc:鍏ュ簱鏁伴噺锛堟湀锛�
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal YearArrivalQty { get; set; }
-
-        /// <summary>
-        /// Desc:鍑哄簱鏁伴噺
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal ExportQty { get; set; }
-
-        /// <summary>
-        /// Desc:鍑哄簱鏁伴噺锛堟湀锛�
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal YearExportQty { get; set; }
-
-        /// <summary>
-        /// Desc:缁撳瓨鏁伴噺
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal BalanceQty { get; set; }
-
-        /// <summary>
-        /// Desc:鏈熷嚭鏁伴噺
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal ExpectedQty { get; set; }
-
-        /// <summary>
-        /// Desc:缁撳瓨鏁伴噺(鏈�)
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal YearBalanceQty { get; set; }
-
-        /// <summary>
-        /// Desc:鏈熷嚭鏁伴噺(鏈�)
-        /// Default:
-        /// Nullable:False
-        /// </summary>           
-        public decimal YearExpectedQty { get; set; }
-
-        /// <summary>
-        /// Desc:鎵规鍙�
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string LotNo { get; set; }
-
-        /// <summary>
-        /// Desc:鎵规鎻忚堪
-        /// Default:
-        /// Nullable:True
-        /// </summary>   
-        public string LotText { get; set; }
-
-        /// <summary>
-        /// Desc:渚涜揣鎵规
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string SupplierLot { get; set; }
-
-
-        /// <summary>
-        /// Desc:鎵�灞炰粨搴�
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string WareHouseNo { get; set; }
-
-
-        /// <summary>
-        /// Desc:鎵�灞炲贩閬�
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string RoadwayNo { get; set; }
-
-        /// <summary>
-        /// 閲嶉噺
-        /// </summary>
-        public decimal Weight { get; set; }
     }
 }

--
Gitblit v1.8.0