From 8389f6d809cc99dedd57fe1e2b2488a9b6f329b7 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 6 Dec 2023 11:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml  | 25 +++++++++++++----
 src/WMS.Web.Domain/Entitys/SerialNumbers.cs | 30 +++++++++++++++------
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index e8c249c3..2f607d68 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1566,14 +1566,29 @@
             创建时间(老ops过来)
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.OutStockBillNo">
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.SalBillNo">
             <summary>
-            出库单号
+            出库单对应销售订单号
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.InStockBillNo">
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.OutStockTime">
+            <summary>
+            出库时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.PurchaseBillNo">
              <summary>
-             入库单号/采购单号
+             采购单号
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.InStockTime">
+            <summary>
+            入库时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.CustomerId">
+             <summary>
+             收货客户
             </summary> 
         </member>
         <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.Bind(System.Int32)">
@@ -1587,7 +1602,7 @@
             解绑
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String,WMS.Web.Domain.Values.OutStockType)">
+        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String,WMS.Web.Domain.Values.OutStockType,System.Int32)">
             <summary>
             出库
             </summary>
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
index 06fcc8e2..3476677a 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
@@ -60,15 +60,25 @@ namespace WMS.Web.Domain.Entitys
         [Column("CreateTime")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
         /// <summary>
-        /// 出库单号
+        /// 出库单对应销售订单号
         /// </summary>
-        [Column("OutStockBillNo")]
-        public string OutStockBillNo { get; set; }
+        [Column("SalBillNo")]
+        public string SalBillNo { get; set; }
         /// <summary>
-        /// 入库单号/采购单号
+        /// 出库时间
+        /// </summary>
+        [Column("OutStockTime")]
+        public DateTime? OutStockTime { get; set; }
+        /// <summary>
+        /// 采购单号
         ///</summary> 
-        [Column("InStockBillNo")]
-        public string InStockBillNo { get; set; }
+        [Column("PurchaseBillNo")]
+        public string PurchaseBillNo { get; set; }
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+        [Column("InStockTime")]
+        public DateTime? InStockTime { get; set; }
         /// <summary>
         /// 收货客户
         ///</summary> 
@@ -99,8 +109,9 @@ namespace WMS.Web.Domain.Entitys
             this.BoxId = 0;
             if (type == OutStockType.Sal)
             {
-                this.OutStockBillNo = outStockBillNo;
+                this.SalBillNo = outStockBillNo;
                 this.CustomerId = customerId;
+                this.OutStockTime = DateTime.Now;
             }
         }
         /// <summary>
@@ -110,7 +121,10 @@ namespace WMS.Web.Domain.Entitys
         public void InStock(string inStockBillNo, InstockType type)
         {
             if (type == InstockType.Purchase)
-                this.InStockBillNo = inStockBillNo;
+            {
+                this.PurchaseBillNo = inStockBillNo;
+                this.InStockTime = DateTime.Now;
+            }
         }
     }
 }