From 6f3051a968e1a3cef67d5a31bc7a3be82c4bf827 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 17 Jul 2023 18:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrder/PurchaseOrderBusiness.cs    |  2 +
 .../Db/Order/OrderPurchaseInfo.cs             | 39 +++----------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 254578e..ee1de14 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -1126,6 +1126,7 @@ namespace BBWYB.Server.Business
         /// <param name="request"></param>
         public void SetHistoryPurchaseOrder(SetHistoryPurchaseOrderRequest request)
         {
+            nLogManager.Default().Info($"SetHistoryPurchaseOrder {JsonConvert.SerializeObject(request)}");
             var dbOrderCostDetailList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == request.OrderId &&
                                                                                     ocd.PurchaseOrderId != request.PurchaseOrderId).ToList();
             var dbOrderCost = fsql.Select<OrderCost>(request.OrderId).ToOne();
@@ -1169,6 +1170,7 @@ namespace BBWYB.Server.Business
                 fsql.Update<OrderPurchaseInfo>(historyPurchaseOrder.Id)
                     .Set(opi => opi.IsEnabled, false)
                     .Set(opi => opi.OrderState, Enums.PurchaseOrderState.已取消)
+                    .Set(opi => opi.HistorySettingTime, DateTime.Now)
                     .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId)
                     .ExecuteAffrows();
 
diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs
index c40d326..5eb6899 100644
--- a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs
+++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs
@@ -56,35 +56,6 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         public long? ShopId { get; set; }
 
-        ///// <summary>
-        ///// ��ݵ���
-        ///// </summary>
-        //[Column(StringLength = 100)]
-        //public string WaybillNo { get; set; }
-
-        ///// <summary>
-        ///// ԭʼ��ݹ�˾����
-        ///// </summary>
-        //[Column(StringLength = 100)]
-        //public string SourceExpressName { get; set; }
-
-        ///// <summary>
-        ///// ԭʼ��ݹ�˾Id
-        ///// </summary>
-        //[Column(StringLength = 100)]
-        //public string SourceExpressId { get; set; }
-
-        ///// <summary>
-        ///// Ŀ���ݹ�˾����
-        ///// </summary>
-        //[Column(StringLength = 100)]
-        //public string TargetExpressName { get; set; }
-
-        ///// <summary>
-        ///// Ŀ���ݹ�˾Id
-        ///// </summary>
-        //[Column(StringLength = 100)]
-        //public string TargetExpressId { get; set; }
 
         /// <summary>
         /// ��������Sku
@@ -101,11 +72,11 @@ namespace BBWYB.Server.Model.Db
         [Column(StringLength = 500)]
         public string Remark { get; set; }
 
-        ///// <summary>
-        ///// �Ƿ�ǩ��
-        ///// </summary>
-        //[Column(DbType = "bit")]
-        //public bool? IsSign { get; set; } = false;
+        /// <summary>
+        /// ������ʷ�ɹ���ʱ��
+        /// </summary>
+        [Column(DbType = "datetime", IsNullable = true)]
+        public DateTime HistorySettingTime { get; set; }
 
         /// <summary>
         /// �ɹ���״̬