From fe41831b0e9057a16aef1e82048105aee671bbda Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 19 十月 2024 19:08:06 +0800
Subject: [PATCH] Merge branch 'master' into Liudl

---
 Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
index 799d05d..b8d8d85 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
@@ -58,21 +58,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:鍖呰缂栧彿
@@ -129,6 +129,14 @@
         public DateTime? CompleteTime { get; set; }
 
         public string OrderDetailCode { get; set; }
+        /// <summary>
+        /// 鎵规灞炴��1-鐢熶骇鏃ユ湡
+        /// </summary>
+        public string Lot1 { get; set; }
+        /// <summary>
+        /// 鎵规灞炴��2-杩囨湡鏃ユ湡
+        /// </summary>
+        public string Lot2 { get; set; }
 
         /// <summary>
         /// 鑷畾涔夊垪1

--
Gitblit v1.8.0