From f42e607f9309c06394c6c46bfdc354ddd5195d51 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期四, 16 一月 2025 08:31:25 +0800
Subject: [PATCH] Merge branch 'Liudl'

---
 Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
index 62c6194..10d15ac 100644
--- a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
@@ -54,21 +54,21 @@
         /// Default:
         /// Nullable:False
         /// </summary>           
-        public int? Qty { get; set; }
+        public decimal? Qty { get; set; }
 
         /// <summary>
         /// Desc:宸茬粍鏁伴噺
         /// Default:0
         /// Nullable:True
         /// </summary>           
-        public int? FactQty { get; set; }
+        public decimal? FactQty { get; set; }
 
         /// <summary>
         /// Desc:鍏ュ簱鏁伴噺
         /// Default:0
         /// Nullable:True
         /// </summary>           
-        public int? CompleteQty { get; set; }
+        public decimal? CompleteQty { get; set; }
 
         /// <summary>
         /// Desc:鍖呰缂栧彿
@@ -122,6 +122,15 @@
         public int? CreateUser { get; set; }
 
         /// <summary>
+        /// 鎵规灞炴��1-鐢熶骇鏃ユ湡
+        /// </summary>
+        public string Lot1 { get; set; }
+        /// <summary>
+        /// 鎵规灞炴��2-杩囨湡鏃ユ湡
+        /// </summary>
+        public string Lot2 { get; set; }
+
+        /// <summary>
         /// 鑷畾涔夊垪1
         /// </summary>
         public string UDF1 { get; set; }

--
Gitblit v1.8.0