From 4e902efe5a81a1f190d2c5a1a9492e5ea188a55b Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 12 May 2023 10:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=87=87=E8=B4=AD=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/APIModel/Response/PurchaseSchemeResponse.cs     | 5 +++++
 BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs       | 6 ++++++
 BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml         | 2 ++
 .../PurchaseOrder/PurchaseOrderBusiness.cs                 | 5 +++++
 .../PurchaseScheme/PurchaseSchemeBusiness.cs               | 3 ++-
 BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs     | 5 +++++
 .../Dto/Request/PurchaseOrder/CargoParamRequest.cs         | 7 +++++++
 7 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs b/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs
index 258f506..c44c023 100644
--- a/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs
@@ -32,6 +32,11 @@ namespace BBWYB.Client.Models
         /// </summary>
         public Platform PurchasePlatform { get; set; }
 
+        /// <summary>
+        /// 最后采购时间
+        /// </summary>
+        public DateTime? LastPurchaseTime { get; set; }
+
         public List<PurchaseSchemeProductResponse> PurchaseSchemeProductList { get; set; }
     }
 
diff --git a/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs b/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs
index 37307b4..bb84ac1 100644
--- a/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs
+++ b/BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
@@ -37,6 +38,11 @@ namespace BBWYB.Client.Models
         /// </summary>
         public Platform PurchasePlatform { get; set; }
 
+        /// <summary>
+        /// 最后采购时间
+        /// </summary>
+        public DateTime? LastPurchaseTime { get; set; }
+
         /// <summary>
         /// 采购方案的商品集合
         /// </summary>
diff --git a/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml b/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml
index 466c155..1928a76 100644
--- a/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml
+++ b/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml
@@ -112,6 +112,8 @@
                                         <TextBlock Text="{Binding PurchasePlatform}" Style="{StaticResource middleTextBlock}"/>
                                         <TextBlock Text="{Binding PurchaserName}" Style="{StaticResource middleTextBlock}" Grid.Column="1"/>
                                         <TextBlock Text="{Binding PurchaserLocation}" Style="{StaticResource middleTextBlock}" Grid.Column="2"/>
+                                        <TextBlock Text="{Binding DefaultCost}" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
+                                        <TextBlock Text="{Binding LastPurchaseTime,StringFormat=yyyy-MM-dd HH:mm:ss}" Grid.Column="4"/>
 
                                         <Border x:Name="bd" Grid.Column="5" Background="{StaticResource Border.Background}">
                                             <TextBlock Text="选择" Style="{StaticResource middleTextBlock}"/>
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 0ae2c13..44d45ee 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -171,6 +171,7 @@ namespace BBWYB.Server.Business
 
             List<OrderCostDetail> insertOrderCostDetails = new List<OrderCostDetail>();
             List<OrderPurchaseInfo> insertOrderPurchaseInfos = new List<OrderPurchaseInfo>();
+            List<long> updatePurchaseTimeSchemeIdList = new List<long>();
             IInsert<OrderCost> insertOrderCost = null;
             IUpdate<OrderCost> updateOrderCost = null;
             var totalPurchaseAmount = 0M;
@@ -184,6 +185,8 @@ namespace BBWYB.Server.Business
                 var client = ppPlatformClientFactory.GetClient((AdapterEnums.PlatformType)cargoParamGroup.PurchasePlatform);
                 var extJson = extJArray.FirstOrDefault(j => j.Value<string>("PurchaserId") == cargoParamGroup.PurchaserId);
 
+                updatePurchaseTimeSchemeIdList.AddRange(cargoParamGroup.CargoParamList.Select(p => p.SchemeId).Distinct());
+
                 var orderProductParamList = CombineRepeatPurchaseSku(cargoParamGroup.CargoParamList);
 
                 var createOrderResponse = client.CreateOrder(new PP_CreateOrderRequest()
@@ -313,6 +316,8 @@ namespace BBWYB.Server.Business
                 fsql.Insert(insertOrderPurchaseInfos).ExecuteAffrows();
                 updateOrderCost?.ExecuteAffrows();
                 insertOrderCost?.ExecuteAffrows();
+                if (updatePurchaseTimeSchemeIdList.Count() > 0)
+                    fsql.Update<PurchaseScheme>(updatePurchaseTimeSchemeIdList).Set(p => p.LastPurchaseTime, DateTime.Now).ExecuteAffrows();
                 fsql.Update<Order>(request.OrderId).SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Model.Enums.OrderState.待出库)
                                                    .SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark)
                                                    .Set(o => o.IsPurchased, true)
diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 165c19e..a8923c7 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -159,7 +159,8 @@ namespace BBWYB.Server.Business
                 DefaultCost = ps.DefaultCost,
                 RealCost = ps.RealCost,
                 CreateTime = ps.CreateTime,
-                PurchasePlatform = ps.PurchasePlatform
+                PurchasePlatform = ps.PurchasePlatform,
+                LastPurchaseTime = ps.LastPurchaseTime
             });
 
             if (purchaseSchemeList.Count > 0)
diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs
index 7b5f150..0a3366a 100644
--- a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs
+++ b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs
@@ -46,6 +46,11 @@ namespace BBWYB.Server.Model.Db
 
         public long ShopId { get; set; }
 
+        /// <summary>
+        /// 最后采购时间
+        /// </summary>
+        public DateTime? LastPurchaseTime { get; set; }
+
         [Column(MapType = typeof(int), DbType = "int(1)")]
         public Enums.Platform PurchasePlatform { get; set; }
 
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs
index 6752807..06b7e4f 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs
@@ -10,13 +10,20 @@
         /// 采购SkuId
         /// </summary>
         public string SkuId { get; set; }
+
         public string SpecId { get; set; }
+
         public int Quantity { get; set; }
 
         /// <summary>
         /// 订单SkuId
         /// </summary>
         public string BelongSkuId { get; set; }
+
+        /// <summary>
+        /// 采购方案Id
+        /// </summary>
+        public long SchemeId { get; set; }
     }
     public class CargoParamGroupRequest
     {